kizlo 0.20.0 → 0.20.1

package/dist/cli/wp/compose/apache-listen.conf

@@ -0,0 +1,15 @@
+# Kizlo local WordPress — make same-site server requests reach Apache.
+#
+# WordPress builds internal, server-side requests (e.g. a plugin calling its own
+# admin_url()) against the browser-facing URL, which carries the *published* host
+# port — say http://localhost:8890. Inside the container that request loops back to
+# localhost:8890, but Apache only listens on 80 (Docker maps the host port to 80),
+# so the call fails with cURL error 7 and the plugin stalls.
+#
+# Listening on the published port as well makes localhost:<port> resolve inside the
+# container exactly as it does from the browser. Apache keeps its port-80 listener
+# for Docker's port mapping and the health check; this only adds a second one.
+#
+# WP_PORT is passed into the wordpress service by the CLI (and defaulted in the base
+# Compose file), so Apache expands ${WP_PORT} from the container environment.
+Listen ${WP_PORT}

package/dist/cli/wp/compose/docker-compose.test.ts

@@ -0,0 +1,66 @@
+import fs from "node:fs"
+import { describe, expect, test } from "vitest"
+import { parse } from "yaml"
+import { APACHE_LISTEN_CONF, COMPOSE_FILE, UPLOADS_INI } from "../constants"
+
+interface Service {
+	environment?: Record<string, string>
+	ports?: string[]
+	volumes?: string[]
+}
+
+const wordpress = (): Service => parse(fs.readFileSync(COMPOSE_FILE, "utf8")).services.wordpress
+
+/** Parse a `key=value` INI (comments/blank lines dropped) into a lookup. */
+function ini(file: string): Record<string, string> {
+	const out: Record<string, string> = {}
+	for (const line of fs.readFileSync(file, "utf8").split("\n")) {
+		const trimmed = line.trim()
+		if (!trimmed || trimmed.startsWith(";")) continue
+		const eq = trimmed.indexOf("=")
+		if (eq !== -1) out[trimmed.slice(0, eq).trim()] = trimmed.slice(eq + 1).trim()
+	}
+	return out
+}
+
+/** PHP size shorthand (`2G`, `2100M`, `512K`) to bytes. */
+function bytes(size: string): number {
+	const match = /^(\d+)([KMG]?)$/i.exec(size)
+	if (!match) throw new Error(`not a PHP size: ${size}`)
+	const scale = { "": 1, K: 1024, M: 1024 ** 2, G: 1024 ** 3 }[match[2]?.toUpperCase() ?? ""] ?? 1
+	return Number(match[1]) * scale
+}
+
+describe("base compose wordpress service", () => {
+	test("receives the published port so Apache can listen on it", () => {
+		// Defaulted to the same value as the port mapping so a standalone `up` still parses.
+		// The `${...}` here are literal Compose interpolation tokens, not JS templates.
+		// biome-ignore lint/suspicious/noTemplateCurlyInString: literal Compose interpolation
+		expect(wordpress().environment?.WP_PORT).toBe("${WP_PORT:-8080}")
+		// biome-ignore lint/suspicious/noTemplateCurlyInString: literal Compose interpolation
+		expect(wordpress().ports).toContain("${WP_PORT:-8080}:80")
+	})
+
+	test("mounts both local-only config assets read-only", () => {
+		const volumes = wordpress().volumes ?? []
+		expect(volumes).toContain("./uploads.ini:/usr/local/etc/php/conf.d/zz-kizlo-uploads.ini:ro")
+		expect(volumes).toContain("./apache-listen.conf:/etc/apache2/conf-enabled/zz-kizlo-listen.conf:ro")
+	})
+})
+
+describe("uploads.ini", () => {
+	test("raises the upload ceiling to 2 GB", () => {
+		expect(ini(UPLOADS_INI).upload_max_filesize).toBe("2G")
+	})
+
+	test("allows POST overhead above the file limit for the multipart envelope", () => {
+		const values = ini(UPLOADS_INI)
+		expect(bytes(values.post_max_size ?? "")).toBeGreaterThan(bytes(values.upload_max_filesize ?? ""))
+	})
+})
+
+describe("apache-listen.conf", () => {
+	test("listens on the injected published port", () => {
+		expect(fs.readFileSync(APACHE_LISTEN_CONF, "utf8")).toMatch(/^\s*Listen\s+\$\{WP_PORT\}\s*$/m)
+	})
+})

package/dist/cli/wp/compose/docker-compose.yml

@@ -40,6 +40,11 @@ services:
       WORDPRESS_DB_NAME: ${MYSQL_DATABASE:-wordpress}
       WORDPRESS_DB_USER: ${MYSQL_USER:-wordpress}
       WORDPRESS_DB_PASSWORD: ${MYSQL_PASSWORD:-wppass}
+      # Published host port, handed to Apache so `apache-listen.conf` can add a
+      # second listener on it (see that file). Defaulted here to match the port
+      # mapping above so a standalone `docker compose up` still parses the config;
+      # every path through the CLI supplies the resolved port as WP_PORT.
+      WP_PORT: ${WP_PORT:-8080}
       # The wordpress image eval()s WORDPRESS_CONFIG_EXTRA at runtime, and Compose
       # interpolates `$` in this file first — so every PHP variable below is written
       # `$$` to survive Compose and reach PHP as a literal `$`.
@@ -56,6 +61,11 @@ services:
         }
     volumes:
       - wp_data:/var/www/html
+      # Real PHP upload limits and the extra Apache listener, both shipped next to
+      # this file (relative binds resolve against the compose file's directory) and
+      # mounted read-only. In the base compose so dev and test stacks both get them.
+      - ./uploads.ini:/usr/local/etc/php/conf.d/zz-kizlo-uploads.ini:ro
+      - ./apache-listen.conf:/etc/apache2/conf-enabled/zz-kizlo-listen.conf:ro
     healthcheck:
       # wp-login.php always returns 200 unauthenticated; /wp-json can be gated to 401
       # by plugins, so it's not a reliable liveness probe.

package/dist/cli/wp/compose/uploads.ini

@@ -0,0 +1,12 @@
+; Kizlo local WordPress — raise PHP's upload ceiling for large imports.
+;
+; PHP rejects an oversized request before WordPress (or an upload plugin) ever
+; sees it, so a WordPress hook that only changes the *displayed* limit is not
+; enough. These are the real server limits the local stacks enforce.
+;
+; post_max_size is deliberately larger than upload_max_filesize: a file upload
+; arrives as a multipart POST, so the whole request is a little bigger than the
+; file itself. 2100M leaves headroom above the 2G (2048M) file limit for that
+; envelope. Nothing else (memory_limit, execution time) is touched.
+upload_max_filesize=2G
+post_max_size=2100M

package/dist/cli/wp/constants.d.ts

@@ -24,6 +24,10 @@ declare function kizloRelease(slug: string): string;
 declare const COMPOSE_FILE: string;
 /** PHP OPcache config, shipped alongside this module and bind-mounted into the local WordPress. */
 declare const OPCACHE_INI: string;
+/** PHP upload-limit config, shipped alongside this module and bind-mounted into the local WordPress. */
+declare const UPLOADS_INI: string;
+/** Apache extra-listener config, shipped alongside this module and bind-mounted into the local WordPress. */
+declare const APACHE_LISTEN_CONF: string;
 /** Linux-only entrypoint that retags www-data to the host user (see the script for why). */
 declare const REMAP_ENTRYPOINT: string;
 declare const CONFIG_FILES: string[];
@@ -54,4 +58,4 @@ declare const DEFAULT_PLUGINS: PluginSource[];
 declare const TEST_ADMIN: Omit<TestAdminUser, "id" | "applicationPassword">;
 declare const TEST_USER: Omit<TestUser, "id">;
 //#endregion
-export { COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, INTROSPECTION_META_REL, LOCAL_DIR_REL, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, githubRelease, kizloRelease };
+export { APACHE_LISTEN_CONF, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, INTROSPECTION_META_REL, LOCAL_DIR_REL, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, UPLOADS_INI, githubRelease, kizloRelease };

package/dist/cli/wp/constants.js

@@ -30,6 +30,10 @@ const HERE = dirname(fileURLToPath(import.meta.url));
 const COMPOSE_FILE = resolve(HERE, "compose/docker-compose.yml");
 /** PHP OPcache config, shipped alongside this module and bind-mounted into the local WordPress. */
 const OPCACHE_INI = resolve(HERE, "compose/opcache.ini");
+/** PHP upload-limit config, shipped alongside this module and bind-mounted into the local WordPress. */
+const UPLOADS_INI = resolve(HERE, "compose/uploads.ini");
+/** Apache extra-listener config, shipped alongside this module and bind-mounted into the local WordPress. */
+const APACHE_LISTEN_CONF = resolve(HERE, "compose/apache-listen.conf");
 /** Linux-only entrypoint that retags www-data to the host user (see the script for why). */
 const REMAP_ENTRYPOINT = resolve(HERE, "compose/remap-entrypoint.sh");
 const CONFIG_FILES = [
@@ -81,4 +85,4 @@ const TEST_USER = {
 };
 
 //#endregion
-export { COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, INTROSPECTION_META_REL, LOCAL_DIR_REL, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, githubRelease, kizloRelease };
+export { APACHE_LISTEN_CONF, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, INTROSPECTION_META_REL, LOCAL_DIR_REL, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, UPLOADS_INI, githubRelease, kizloRelease };

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.20.0";
+var version = "0.20.1";
 
 //#endregion
 export { version };

package/dist/test.d.ts

@@ -1,5 +1,5 @@
 import { DevPluginSource, Fixture, FixtureCleanupFn, FixtureSeedFn, FixtureSettleFn, JsonValue, LocalPlugin, PluginSource, SeedContext, SettleContext, TestAdminUser, TestCredentials, TestUser, defineFixture, isLocalPlugin } from "./cli/wp/types.js";
-import { COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, INTROSPECTION_META_REL, LOCAL_DIR_REL, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, githubRelease, kizloRelease } from "./cli/wp/constants.js";
+import { APACHE_LISTEN_CONF, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, INTROSPECTION_META_REL, LOCAL_DIR_REL, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, UPLOADS_INI, githubRelease, kizloRelease } from "./cli/wp/constants.js";
 import { DockerStack, DockerStatus, RunResult, Stack, StackStatus, compose, composeDown, composePull, composeStop, composeUp, createStack, dockerAvailable, dockerHint, dockerStatus, runningProjectContainers, stackStatus, stopProjectContainers, wpCli, wpEval } from "./cli/wp/docker.js";
 import { activateLocalPlugin, credentialsPath, ensurePlugin, ensurePlugins, findConfigDir, getTestCredentials, isSeeded, recordedPort, resolvePluginSource, settleFixtures } from "./cli/wp/utils.js";
 import { TestAuthAdapterUser, toTestUser } from "./test/users.js";
@@ -8,4 +8,4 @@ import { CAPTCHA_TEST_TOKEN_PASS, captchaMock } from "./test/captcha.js";
 import { menuFixture } from "./menu/fixture.js";
 import { postFixture } from "./post/fixture.js";
 import { coreFixtures } from "./test/fixtures.js";
-export { CAPTCHA_TEST_TOKEN_PASS, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, DevPluginSource, DockerStack, DockerStatus, Fixture, FixtureCleanupFn, FixtureSeedFn, FixtureSettleFn, INTROSPECTION_META_REL, JsonValue, LOCAL_DIR_REL, LocalPlugin, OPCACHE_INI, PluginSource, REMAP_ENTRYPOINT, RunResult, SEED_MARKER_OPTION, SEED_VERSION, SeedContext, SettleContext, Stack, StackStatus, TEST_ADMIN, TEST_USER, TestAdminUser, TestAuthAdapterUser, TestCredentials, TestUser, activateLocalPlugin, captchaMock, compose, composeDown, composePull, composeStop, composeUp, coreFixtures, createStack, credentialsPath, defineFixture, dockerAvailable, dockerHint, dockerStatus, ensurePlugin, ensurePlugins, findConfigDir, getTestCredentials, githubRelease, isLocalPlugin, isSeeded, kizloRelease, menuFixture, postFixture, recordedPort, resolvePluginSource, runningProjectContainers, settleFixtures, stackStatus, stopProjectContainers, testAuthAdapter, toTestUser, wpCli, wpEval };
+export { APACHE_LISTEN_CONF, CAPTCHA_TEST_TOKEN_PASS, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, DevPluginSource, DockerStack, DockerStatus, Fixture, FixtureCleanupFn, FixtureSeedFn, FixtureSettleFn, INTROSPECTION_META_REL, JsonValue, LOCAL_DIR_REL, LocalPlugin, OPCACHE_INI, PluginSource, REMAP_ENTRYPOINT, RunResult, SEED_MARKER_OPTION, SEED_VERSION, SeedContext, SettleContext, Stack, StackStatus, TEST_ADMIN, TEST_USER, TestAdminUser, TestAuthAdapterUser, TestCredentials, TestUser, UPLOADS_INI, activateLocalPlugin, captchaMock, compose, composeDown, composePull, composeStop, composeUp, coreFixtures, createStack, credentialsPath, defineFixture, dockerAvailable, dockerHint, dockerStatus, ensurePlugin, ensurePlugins, findConfigDir, getTestCredentials, githubRelease, isLocalPlugin, isSeeded, kizloRelease, menuFixture, postFixture, recordedPort, resolvePluginSource, runningProjectContainers, settleFixtures, stackStatus, stopProjectContainers, testAuthAdapter, toTestUser, wpCli, wpEval };

package/dist/test.js

@@ -1,5 +1,5 @@
 import { defineFixture, isLocalPlugin } from "./cli/wp/types.js";
-import { COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, INTROSPECTION_META_REL, LOCAL_DIR_REL, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, githubRelease, kizloRelease } from "./cli/wp/constants.js";
+import { APACHE_LISTEN_CONF, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, INTROSPECTION_META_REL, LOCAL_DIR_REL, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, UPLOADS_INI, githubRelease, kizloRelease } from "./cli/wp/constants.js";
 import { compose, composeDown, composePull, composeStop, composeUp, createStack, dockerAvailable, dockerHint, dockerStatus, runningProjectContainers, stackStatus, stopProjectContainers, wpCli, wpEval } from "./cli/wp/docker.js";
 import { activateLocalPlugin, credentialsPath, ensurePlugin, ensurePlugins, findConfigDir, getTestCredentials, isSeeded, recordedPort, resolvePluginSource, settleFixtures } from "./cli/wp/utils.js";
 import { testAuthAdapter } from "./test/auth.js";
@@ -9,4 +9,4 @@ import { postFixture } from "./post/fixture.js";
 import { coreFixtures } from "./test/fixtures.js";
 import { toTestUser } from "./test/users.js";
 
-export { CAPTCHA_TEST_TOKEN_PASS, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, INTROSPECTION_META_REL, LOCAL_DIR_REL, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, activateLocalPlugin, captchaMock, compose, composeDown, composePull, composeStop, composeUp, coreFixtures, createStack, credentialsPath, defineFixture, dockerAvailable, dockerHint, dockerStatus, ensurePlugin, ensurePlugins, findConfigDir, getTestCredentials, githubRelease, isLocalPlugin, isSeeded, kizloRelease, menuFixture, postFixture, recordedPort, resolvePluginSource, runningProjectContainers, settleFixtures, stackStatus, stopProjectContainers, testAuthAdapter, toTestUser, wpCli, wpEval };
+export { APACHE_LISTEN_CONF, CAPTCHA_TEST_TOKEN_PASS, COMPOSE_FILE, CONFIG_FILES, CREDENTIALS_REL, DEFAULT_PLUGINS, DEFAULT_PORT, DEFAULT_WORDPRESS_TAG, INTROSPECTION_META_REL, LOCAL_DIR_REL, OPCACHE_INI, REMAP_ENTRYPOINT, SEED_MARKER_OPTION, SEED_VERSION, TEST_ADMIN, TEST_USER, UPLOADS_INI, activateLocalPlugin, captchaMock, compose, composeDown, composePull, composeStop, composeUp, coreFixtures, createStack, credentialsPath, defineFixture, dockerAvailable, dockerHint, dockerStatus, ensurePlugin, ensurePlugins, findConfigDir, getTestCredentials, githubRelease, isLocalPlugin, isSeeded, kizloRelease, menuFixture, postFixture, recordedPort, resolvePluginSource, runningProjectContainers, settleFixtures, stackStatus, stopProjectContainers, testAuthAdapter, toTestUser, wpCli, wpEval };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kizlo",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "type": "module",
   "description": "A headless WordPress framework for TypeScript.",
   "keywords": [