vite-plugin-php 2.0.0 → 2.0.2

package/README.md

@@ -29,7 +29,7 @@ export default defineConfig({
 
 <p align="center" style="text-align: center;">
 	<b>
-		<a href="https://vite-php.nititech.de/">Wiki</a> | <a href="https://github.com/donnikitos/vite-plugin-php/discussions">Discussions</a> | <a href="https://github.com/nititech/php-vite-starter">Starter-Repo</a>
+		<a href="https://www.npmjs.com/package/vite-plugin-php">NPM</a> | <a href="https://vite-php.nititech.de/">Wiki</a> | <a href="https://github.com/donnikitos/vite-plugin-php/discussions">Discussions</a> | <a href="https://github.com/nititech/php-vite-starter">Starter-Repo</a>
 	</b>
 </p>
 
@@ -84,6 +84,8 @@ The configuration takes following properties:
 ```ts
 type UsePHPConfig = {
 	binary?: string;
+	// Override default PHP server host address. Default is `localhost`.
+	php?: { host?: string };
 	entry?: string | string[];
 	rewriteUrl?: (requestUrl: URL) => URL | undefined;
 	tempDir?: string;

package/dist/index.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const node_child_process = require('node:child_process');
 const url = require('url');
 const node_path = require('node:path');
+const tcpPortUsed = require('tcp-port-used');
 const require$$0 = require('os');
 const require$$0$1 = require('path');
 const require$$0$2 = require('util');
@@ -18,6 +19,7 @@ const vite = require('vite');
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
+const tcpPortUsed__default = /*#__PURE__*/_interopDefaultCompat(tcpPortUsed);
 const require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);
 const require$$0__default$1 = /*#__PURE__*/_interopDefaultCompat(require$$0$1);
 const require$$0__default$2 = /*#__PURE__*/_interopDefaultCompat(require$$0$2);
@@ -210,38 +212,46 @@ log.error = function(json, options = {}) {
 
 const PHP_Server = {
   binary: "php",
-  port: 65535,
+  host: "localhost",
+  port: 6535,
   process: void 0,
   start,
   stop
 };
-function start(root) {
+async function start(root) {
   if (!PHP_Server.process?.pid) {
-    const routerFileUrl = new URL("./router.php", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
-    PHP_Server.process = node_child_process.spawn(PHP_Server.binary, [
-      "-S",
-      "localhost:" + PHP_Server.port,
-      "-t",
-      root,
-      url.fileURLToPath(routerFileUrl)
-    ]).once("spawn", () => {
-      log(`Server started (PID: ${PHP_Server.process?.pid})`);
-    }).on("error", (error) => {
-      log(`Server error: ${error.message})`, {
-        type: "error"
+    await new Promise(async (resolve, reject) => {
+      const routerFileUrl = new URL("./router.php", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
+      while (await tcpPortUsed__default.check(PHP_Server.port, PHP_Server.host)) {
+        PHP_Server.port++;
+      }
+      PHP_Server.process = node_child_process.spawn(PHP_Server.binary, [
+        "-S",
+        `${PHP_Server.host}:${PHP_Server.port}`,
+        "-t",
+        root,
+        url.fileURLToPath(routerFileUrl)
+      ]).once("spawn", () => {
+        log(`Server started (PID: ${PHP_Server.process?.pid})`);
+        resolve(PHP_Server.process?.pid);
+      }).on("error", (error) => {
+        log(`Server error: ${error.message})`, {
+          type: "error"
+        });
+        reject(error);
       });
-    });
-    PHP_Server.process.stdout?.on("data", (data) => {
-      log("", { timestamp: true });
-      `${data}`.trim().split("\r\n").forEach((line) => {
-        if (line.startsWith(internalParam + ":")) {
-          log.error(
-            line.substring((internalParam + ":").length),
-            { prefix: false }
-          );
-        } else {
-          log(line);
-        }
+      PHP_Server.process.stdout?.on("data", (data) => {
+        log("", { timestamp: true });
+        `${data}`.trim().split("\r\n").forEach((line) => {
+          if (line.startsWith(internalParam + ":")) {
+            log.error(
+              line.substring((internalParam + ":").length),
+              { prefix: false }
+            );
+          } else {
+            log(line);
+          }
+        });
       });
     });
   }
@@ -7175,9 +7185,9 @@ const servePlugin = {
       PHP_Code.fromFile(entry).applyEnv().write(tempName(entry));
     });
   },
-  configureServer(server) {
+  async configureServer(server) {
     if (!PHP_Server.process) {
-      PHP_Server.start(server?.config.root);
+      await PHP_Server.start(server?.config.root);
     }
     server.middlewares.use(async (req, res, next) => {
       try {
@@ -7209,6 +7219,7 @@ const servePlugin = {
             const tempFile = tempName(entry);
             if (node_fs.existsSync(node_path.resolve(tempFile))) {
               url.pathname = tempFile;
+              url.host = PHP_Server.host;
               url.port = PHP_Server.port.toString();
               url.searchParams.set(
                 internalParam,
@@ -7273,7 +7284,7 @@ const servePlugin = {
                 "html"
               )) {
                 out = await server.transformIndexHtml(
-                  `/${entry}.html`,
+                  `/${entry}.html:${requestUrl}`,
                   out,
                   requestUrl
                 );
@@ -7411,6 +7422,7 @@ const buildPlugin = {
 function usePHP(cfg = {}) {
   const { entry = "index.php" } = cfg;
   PHP_Server.binary = cfg.binary ?? PHP_Server.binary;
+  PHP_Server.host = cfg.php?.host ?? PHP_Server.host;
   serve.rewriteUrl = cfg.rewriteUrl ?? serve.rewriteUrl;
   shared.entries = Array.isArray(entry) ? entry : [entry];
   shared.tempDir = cfg.tempDir ?? shared.tempDir;

package/dist/index.d.cts

@@ -22,6 +22,9 @@ type EPHPError = (typeof EPHPError)[keyof typeof EPHPError];
 
 type UsePHPConfig = {
     binary?: string;
+    php?: {
+        host?: string;
+    };
     entry?: string | string[];
     rewriteUrl?: (requestUrl: URL) => URL | undefined;
     tempDir?: string;

package/dist/index.d.mts

@@ -22,6 +22,9 @@ type EPHPError = (typeof EPHPError)[keyof typeof EPHPError];
 
 type UsePHPConfig = {
     binary?: string;
+    php?: {
+        host?: string;
+    };
     entry?: string | string[];
     rewriteUrl?: (requestUrl: URL) => URL | undefined;
     tempDir?: string;

package/dist/index.d.ts

@@ -22,6 +22,9 @@ type EPHPError = (typeof EPHPError)[keyof typeof EPHPError];
 
 type UsePHPConfig = {
     binary?: string;
+    php?: {
+        host?: string;
+    };
     entry?: string | string[];
     rewriteUrl?: (requestUrl: URL) => URL | undefined;
     tempDir?: string;

package/dist/index.mjs

@@ -1,6 +1,7 @@
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'url';
 import { resolve, dirname, relative } from 'node:path';
+import tcpPortUsed from 'tcp-port-used';
 import require$$0 from 'os';
 import require$$0$1 from 'path';
 import require$$0$2 from 'util';
@@ -195,38 +196,46 @@ log.error = function(json, options = {}) {
 
 const PHP_Server = {
   binary: "php",
-  port: 65535,
+  host: "localhost",
+  port: 6535,
   process: void 0,
   start,
   stop
 };
-function start(root) {
+async function start(root) {
   if (!PHP_Server.process?.pid) {
-    const routerFileUrl = new URL("./router.php", import.meta.url);
-    PHP_Server.process = spawn(PHP_Server.binary, [
-      "-S",
-      "localhost:" + PHP_Server.port,
-      "-t",
-      root,
-      fileURLToPath(routerFileUrl)
-    ]).once("spawn", () => {
-      log(`Server started (PID: ${PHP_Server.process?.pid})`);
-    }).on("error", (error) => {
-      log(`Server error: ${error.message})`, {
-        type: "error"
+    await new Promise(async (resolve, reject) => {
+      const routerFileUrl = new URL("./router.php", import.meta.url);
+      while (await tcpPortUsed.check(PHP_Server.port, PHP_Server.host)) {
+        PHP_Server.port++;
+      }
+      PHP_Server.process = spawn(PHP_Server.binary, [
+        "-S",
+        `${PHP_Server.host}:${PHP_Server.port}`,
+        "-t",
+        root,
+        fileURLToPath(routerFileUrl)
+      ]).once("spawn", () => {
+        log(`Server started (PID: ${PHP_Server.process?.pid})`);
+        resolve(PHP_Server.process?.pid);
+      }).on("error", (error) => {
+        log(`Server error: ${error.message})`, {
+          type: "error"
+        });
+        reject(error);
       });
-    });
-    PHP_Server.process.stdout?.on("data", (data) => {
-      log("", { timestamp: true });
-      `${data}`.trim().split("\r\n").forEach((line) => {
-        if (line.startsWith(internalParam + ":")) {
-          log.error(
-            line.substring((internalParam + ":").length),
-            { prefix: false }
-          );
-        } else {
-          log(line);
-        }
+      PHP_Server.process.stdout?.on("data", (data) => {
+        log("", { timestamp: true });
+        `${data}`.trim().split("\r\n").forEach((line) => {
+          if (line.startsWith(internalParam + ":")) {
+            log.error(
+              line.substring((internalParam + ":").length),
+              { prefix: false }
+            );
+          } else {
+            log(line);
+          }
+        });
       });
     });
   }
@@ -7160,9 +7169,9 @@ const servePlugin = {
       PHP_Code.fromFile(entry).applyEnv().write(tempName(entry));
     });
   },
-  configureServer(server) {
+  async configureServer(server) {
     if (!PHP_Server.process) {
-      PHP_Server.start(server?.config.root);
+      await PHP_Server.start(server?.config.root);
     }
     server.middlewares.use(async (req, res, next) => {
       try {
@@ -7194,6 +7203,7 @@ const servePlugin = {
             const tempFile = tempName(entry);
             if (existsSync(resolve(tempFile))) {
               url.pathname = tempFile;
+              url.host = PHP_Server.host;
               url.port = PHP_Server.port.toString();
               url.searchParams.set(
                 internalParam,
@@ -7258,7 +7268,7 @@ const servePlugin = {
                 "html"
               )) {
                 out = await server.transformIndexHtml(
-                  `/${entry}.html`,
+                  `/${entry}.html:${requestUrl}`,
                   out,
                   requestUrl
                 );
@@ -7396,6 +7406,7 @@ const buildPlugin = {
 function usePHP(cfg = {}) {
   const { entry = "index.php" } = cfg;
   PHP_Server.binary = cfg.binary ?? PHP_Server.binary;
+  PHP_Server.host = cfg.php?.host ?? PHP_Server.host;
   serve.rewriteUrl = cfg.rewriteUrl ?? serve.rewriteUrl;
   shared.entries = Array.isArray(entry) ? entry : [entry];
   shared.tempDir = cfg.tempDir ?? shared.tempDir;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vite-plugin-php",
-	"version": "2.0.0",
+	"version": "2.0.2",
 	"author": "Nikita 'donnikitos' Nitichevski <me@donnikitos.com> (https://donnikitos.com/)",
 	"repository": {
 		"type": "git",
@@ -10,6 +10,7 @@
 	"module": "./dist/index.mjs",
 	"devDependencies": {
 		"@types/node": "^22.9.0",
+		"@types/tcp-port-used": "^1.0.4",
 		"fast-glob": "^3.3.2",
 		"picocolors": "^1.1.1",
 		"typescript": "^5.6.3",
@@ -65,5 +66,8 @@
 		"prepack": "npm run build"
 	},
 	"type": "module",
-	"types": "./dist/index.d.ts"
+	"types": "./dist/index.d.ts",
+	"dependencies": {
+		"tcp-port-used": "^1.0.2"
+	}
 }