@multiplatform.one/utils 7.90.3 → 7.90.5

package/lib/dev.cjs

@@ -67,7 +67,8 @@ async function waitForPostgres(interval) {
 	}
 }
 async function waitForMariaDB(interval) {
-	const connection = await require("mysql2/promise").createConnection({
+	const { createConnection } = await import("mysql2/promise");
+	const connection = await createConnection({
 		host: process.env.MARIADB_HOSTNAME || "localhost",
 		port: Number.parseInt(process.env.MARIADB_PORT || "3306"),
 		user: process.env.MARIADB_USERNAME || "root",

package/lib/dev.mjs

@@ -5,10 +5,6 @@ import path from "node:path";
 import axios from "axios";
 import pg from "pg";
 
-//#region \0rolldown/runtime.js
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
-
-//#endregion
 //#region src/wait.ts
 async function waitForFrappe(interval) {
 	try {
@@ -39,7 +35,8 @@ async function waitForPostgres(interval) {
 	}
 }
 async function waitForMariaDB(interval) {
-	const connection = await __require("mysql2/promise").createConnection({
+	const { createConnection } = await import("mysql2/promise");
+	const connection = await createConnection({
 		host: process.env.MARIADB_HOSTNAME || "localhost",
 		port: Number.parseInt(process.env.MARIADB_PORT || "3306"),
 		user: process.env.MARIADB_USERNAME || "root",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/utils",
-  "version": "7.90.3",
+  "version": "7.90.5",
   "description": "utilities for multiplatform.one",
   "keywords": [
     "multiplatform.one",

package/src/wait.ts

@@ -37,8 +37,8 @@ export async function waitForPostgres(interval: number) {
 }
 
 export async function waitForMariaDB(interval: number) {
-  const mysql = require("mysql2/promise");
-  const connection = await mysql.createConnection({
+  const { createConnection } = await import("mysql2/promise");
+  const connection = await createConnection({
     host: process.env.MARIADB_HOSTNAME || "localhost",
     port: Number.parseInt(process.env.MARIADB_PORT || "3306"),
     user: process.env.MARIADB_USERNAME || "root",

package/src/waitLoops.spec.ts

@@ -3,8 +3,7 @@ import axios from "axios";
 import { waitForFrappe, waitForKeycloak, waitForPostgres } from "./wait";
 
 // NOTE: waitForMariaDB is intentionally not covered here — it loads its
-// driver through a bare `require("mysql2/promise")`, which bypasses vitest
-// module mocks, so it cannot be exercised without touching the network.
+// driver through `import("mysql2/promise")`, mocked in waitMariaDB.spec.ts.
 
 vi.mock("axios", () => ({
   default: { get: vi.fn() },

package/src/waitMariaDB.spec.ts

@@ -0,0 +1,73 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { waitForMariaDB } from "./wait";
+
+// The driver is loaded with import(), which vitest mocks reach. A bare
+// require() would bypass this mock and dial a real MariaDB, and it throws
+// "require is not defined" when `mpo wait` runs from source under tsx.
+const mysql = vi.hoisted(() => ({
+  execute: vi.fn(),
+  end: vi.fn(),
+  config: undefined as Record<string, unknown> | undefined,
+}));
+
+vi.mock("mysql2/promise", () => ({
+  createConnection: vi.fn(async (config: Record<string, unknown>) => {
+    mysql.config = config;
+    return { execute: mysql.execute, end: mysql.end };
+  }),
+}));
+
+const envKeys = [
+  "MARIADB_DATABASE",
+  "MARIADB_HOSTNAME",
+  "MARIADB_PASSWORD",
+  "MARIADB_PORT",
+  "MARIADB_USERNAME",
+] as const;
+
+describe("waitForMariaDB (FZ-10496)", () => {
+  const saved: Partial<Record<(typeof envKeys)[number], string | undefined>> = {};
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+    for (const key of envKeys) {
+      saved[key] = process.env[key];
+      delete process.env[key];
+    }
+    mysql.execute.mockReset().mockResolvedValue([[], []]);
+    mysql.end.mockReset().mockResolvedValue(undefined);
+    mysql.config = undefined;
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    for (const key of envKeys) {
+      if (saved[key] === undefined) delete process.env[key];
+      else process.env[key] = saved[key];
+    }
+  });
+
+  it("connects with the defaults, answers SELECT 1 and closes", async () => {
+    await expect(waitForMariaDB(1000)).resolves.toBeUndefined();
+    expect(mysql.config).toEqual({
+      host: "localhost",
+      port: 3306,
+      user: "root",
+      password: "root",
+      database: "frappe",
+    });
+    expect(mysql.execute).toHaveBeenCalledWith("SELECT 1");
+    expect(mysql.end).toHaveBeenCalledTimes(1);
+  });
+
+  it("polls every interval until SELECT 1 answers", async () => {
+    process.env.MARIADB_PORT = "3307";
+    mysql.execute.mockRejectedValueOnce(new Error("not yet")).mockResolvedValue([[], []]);
+    const ready = waitForMariaDB(500);
+    await vi.advanceTimersByTimeAsync(500);
+    await expect(ready).resolves.toBeUndefined();
+    expect(mysql.config?.port).toBe(3307);
+    expect(mysql.execute).toHaveBeenCalledTimes(2);
+    expect(mysql.end).toHaveBeenCalledTimes(1);
+  });
+});