@qelos/plugin-netlify-api 1.0.2 → 1.0.4

package/README.md

@@ -43,9 +43,9 @@ Optional: set the API URL (default `http://159.203.152.168`) and/or enable bypas
 ## What it does
 
 - **Environment:** Sets `QELOS_API_IP` for the build (and for the proxy function at runtime).
-- **Redirect:** Adds a rewrite so `/api/*` is served by `/.netlify/functions/qelos-api-proxy` (status 200, force).
-- **Function:** Injects a serverless function `qelos-api-proxy` that forwards requests to the host/port from `QELOS_API_IP` (supports a full URL like `http://159.203.152.168` or a hostname).
+- **Redirect:** Adds a rewrite in `netlify.toml` and, **after the site build**, prepends the same rule to **`publish/_redirects`** when that file exists. Netlify applies `_redirects` **before** `netlify.toml`; frameworks (e.g. Nuxt `netlify-static`) often emit `/* → /404.html` first, which would otherwise match `/api/*` and never reach the proxy.
+- **Function:** Copies `qelos-api-proxy.ts` from the package into your Netlify **functions directory** (default `netlify/functions`, or `[functions] directory` in `netlify.toml`) during `onPreBuild`, so the bundler sees a normal function file. Forwards requests using `QELOS_API_IP` / `API_HOST` (full URL or hostname).
 
-No need to add redirects or the function file to your repo; the plugin does it at build time.
+No need to add redirects or commit the proxy yourself; the plugin writes it each build. Optional: add `netlify/functions/qelos-api-proxy.ts` to `.gitignore` if you run local Netlify builds and do not want the copy tracked.
 
 **Parity with a manual Netlify function** (e.g. `[[redirects]]` → `/.netlify/functions/api-proxy` and a function using `process.env.API_HOST`): use this plugin instead of those entries; set `QELOS_API_IP` or `API_HOST` to the same value you used for `API_HOST`, and set `bypass_admin = true` under `[plugins.inputs]` if your old proxy always sent `x-bypass-admin: true`.

package/index.js

@@ -1,9 +1,19 @@
+const fs = require('node:fs/promises');
 const path = require('node:path');
 
 const DEFAULT_API_URL = 'http://159.203.152.168';
 
+/** Must appear before any `/*` rule in publish/_redirects — Netlify evaluates that file before netlify.toml. */
+const REDIRECTS_FILE_LINE =
+  '/api/* /.netlify/functions/qelos-api-proxy 200!\n';
+
+function resolveFunctionsDirectory(netlifyConfig) {
+  const dir = netlifyConfig.functions?.directory ?? 'netlify/functions';
+  return path.isAbsolute(dir) ? dir : path.join(process.cwd(), dir);
+}
+
 module.exports = {
-  async onPreBuild({ netlifyConfig, utils, inputs }) {
+  async onPreBuild({ netlifyConfig, inputs }) {
     const apiUrl =
       inputs.api_url ?? process.env.QELOS_API_IP ?? DEFAULT_API_URL;
     const bypassAdmin =
@@ -19,13 +29,17 @@ module.exports = {
     }
 
     if (!netlifyConfig.functions) {
-      // [functions]
-      //  directory = "netlify/functions"
       netlifyConfig.functions = { directory: 'netlify/functions' };
-    } else {
-      // should use this dir as path of the stored function
     }
 
+    // Copy the proxy into the site's functions dir so Netlify bundles it like any
+    // checked-in function (utils.functions.add from node_modules is unreliable for .ts).
+    const destDir = resolveFunctionsDirectory(netlifyConfig);
+    const destFile = path.join(destDir, 'qelos-api-proxy.ts');
+    const srcFile = path.join(__dirname, 'functions', 'qelos-api-proxy.ts');
+    await fs.mkdir(destDir, { recursive: true });
+    await fs.copyFile(srcFile, destFile);
+
     // Add redirect: /api/* -> Netlify function (proxy)
     if (!netlifyConfig.redirects) {
       netlifyConfig.redirects = [];
@@ -36,14 +50,24 @@ module.exports = {
       status: 200,
       force: true,
     });
+  },
 
-    // Inject the proxy function (must run in onPreBuild so it's bundled)
-    const pluginRoot = __dirname;
-    const functionPath = path.join(
-      pluginRoot,
-      'functions',
-      'qelos-api-proxy.ts',
-    );
-    await utils.functions.add(functionPath);
+  /**
+   * Nuxt/static generators emit `dist/_redirects` with `/* → 404` first. Netlify runs
+   * `_redirects` rules before `netlify.toml`, so that catch-all wins unless `/api/*` is
+   * prepended here (after the framework build).
+   */
+  async onPostBuild({ constants }) {
+    const publishDir = constants.PUBLISH_DIR;
+    if (!publishDir) return;
+    const redirectsPath = path.join(publishDir, '_redirects');
+    let existing = '';
+    try {
+      existing = await fs.readFile(redirectsPath, 'utf8');
+    } catch (e) {
+      if (e.code !== 'ENOENT') throw e;
+    }
+    if (existing.includes('qelos-api-proxy')) return;
+    await fs.writeFile(redirectsPath, REDIRECTS_FILE_LINE + existing, 'utf8');
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qelos/plugin-netlify-api",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Netlify build plugin: proxy /api/* to Qelos API and inject config",
   "main": "index.js",
   "files": [