@olenbetong/appframe-vite 6.1.0 → 6.1.2

package/lib/devServer.js

@@ -6,6 +6,7 @@ import dotenv from "dotenv";
 import { JSDOM } from "jsdom";
 import { importJson } from "./importJson.js";
 import { getStringCache } from "./localization.js";
+import { diagnoseServerResponse } from "./utils.js";
 dotenv.config({ quiet: true });
 let appPkg = await importJson("./package.json", true);
 let { appframe } = appPkg;
@@ -129,7 +130,27 @@ async function getArticleHtml() {
     let { hostname, username, password } = await getLoginInfo();
     let article = appframe.article?.id;
     let client = new Client(hostname);
-    await client.login(username, password);
+    try {
+        await client.login(username, password);
+    }
+    catch (loginError) {
+        const isJsonError = loginError instanceof SyntaxError &&
+            (loginError.message.includes("not valid JSON") || loginError.message.includes("Unexpected token"));
+        if (isJsonError) {
+            let loginBody = `username=${encodeURIComponent(username)}&password=${encodeURIComponent(password)}&remember=true&RequireTwoFactor=0`;
+            let diagnostic = await diagnoseServerResponse(`https://${hostname}/login`, {
+                method: "POST",
+                body: loginBody,
+                headers: {
+                    "Content-Type": "application/x-www-form-urlencoded",
+                    Accept: "application/json",
+                },
+                followRedirects: true,
+            });
+            throw new Error(`login to ${hostname} (article HTML fetch): server returned non-JSON. Server response:\n${diagnostic}`);
+        }
+        throw loginError;
+    }
     let response = await client.fetch(`/${article}`, {
         timeout: 30_000,
         method: "GET",

package/lib/generateTypes.js

@@ -5,7 +5,7 @@ import { resolve } from "node:path";
 import vm from "node:vm";
 import { Client, DataObject, generateApiDataHandler, getDefaultClient, Procedure, setDefaultClient, } from "@olenbetong/appframe-data";
 import { importJson } from "./importJson.js";
-import { createLogMessage } from "./utils.js";
+import { createLogMessage, diagnoseServerResponse, wrapJsonError } from "./utils.js";
 // ─── Type generation logic ────────────────────────────────────────────────────
 function afTypeToTsType(type, isProc = false) {
     if (type === "uniqueidentifier")
@@ -136,7 +136,27 @@ const RETRY_DELAY_BASE_MS = 2_000;
 async function doGenerateTypes(hostname, username, password, appframe) {
     const client = new Client(hostname);
     setDefaultClient(client);
-    await withTimeout(client.login(username, password), TIMEOUT_MS, "login");
+    try {
+        await withTimeout(client.login(username, password), TIMEOUT_MS, "login");
+    }
+    catch (loginError) {
+        const isJsonError = loginError instanceof SyntaxError &&
+            (loginError.message.includes("not valid JSON") || loginError.message.includes("Unexpected token"));
+        if (isJsonError) {
+            let loginBody = `username=${encodeURIComponent(username)}&password=${encodeURIComponent(password)}&remember=true&RequireTwoFactor=0`;
+            let diagnostic = await diagnoseServerResponse(`https://${hostname}/login`, {
+                method: "POST",
+                body: loginBody,
+                headers: {
+                    "Content-Type": "application/x-www-form-urlencoded",
+                    Accept: "application/json",
+                },
+                followRedirects: true,
+            });
+            throw new Error(`login to ${hostname}: server returned non-JSON. Server response:\n${diagnostic}`);
+        }
+        throw loginError;
+    }
     const articleId = appframe.article?.id ?? appframe.article;
     const articleHost = appframe.article?.hostname ?? hostname;
     const scriptGlobal = {
@@ -194,10 +214,10 @@ async function doGenerateTypes(hostname, username, password, appframe) {
     types = headerComment + types;
     // Append article feature flags
     const dsFeatures = createArticlesFeaturesDataHandler();
-    const features = await withTimeout(dsFeatures.retrieve({
+    const features = await wrapJsonError(`fetch article features for '${articleId}' on ${articleHost}`, () => withTimeout(dsFeatures.retrieve({
         maxRecords: -1,
         whereClause: `[HostName] = '${articleHost}' AND [ArticleId] = '${articleId}'`,
-    }), TIMEOUT_MS, "fetch article features");
+    }), TIMEOUT_MS, "fetch article features"));
     if (features.length) {
         types += `\n\ndeclare module "@olenbetong/appframe-core" {\n\tinterface AfArticle {\n\t\tfeatures: {\n\t\t\t${features
             .map((f) => `/**\n\t\t\t * ${f.Name}: ${f.Description}\n\t\t\t */\n\t\t\t${f.Key}: boolean;`)

package/lib/localization.js

@@ -67,6 +67,13 @@ export const localizeMiddleware = async (req, res, _next) => {
                 "X-Requested-With": "XMLHttpRequest",
             },
         });
+        const contentType = result.headers.get("content-type") ?? "";
+        if (!result.ok || !contentType.includes("application/json")) {
+            let body = await result.text();
+            throw new Error(`POST ${uri} returned ${result.status} ${result.statusText} ` +
+                `(Content-Type: ${contentType || "none"}). ` +
+                `Response snippet: ${body.slice(0, 300)}`);
+        }
         let data = await result.json();
         addStringToCache(text, data);
         res.statusCode = 200;

package/lib/utils.d.ts

@@ -5,6 +5,26 @@ export declare const PLUGIN_TAG: string;
 /** Returns a colored environment tag (`[dev]` / `[stage]` / `[prod]`) based on hostname. */
 export declare function getServerPrefix(hostname: string): string;
 export declare function getServerName(hostname: string): string;
+/**
+ * Wraps an async operation. If the caught error is a JSON parse error
+ * (SyntaxError from undici/fetch `.json()` on an HTML response), re-throws
+ * with `context` prepended so it's obvious which network call failed.
+ */
+export declare function wrapJsonError<T>(context: string, fn: () => Promise<T>): Promise<T>;
+/**
+ * Makes a diagnostic HTTP request and returns the full response body + metadata
+ * as a human-readable string. Used to show what the server is actually returning
+ * when a JSON-parse error occurs inside a library that swallows the response body.
+ *
+ * Pass followRedirects: true to follow the redirect chain (useful when the library
+ * auto-follows redirects and fails on the final response).
+ */
+export declare function diagnoseServerResponse(url: string, options?: {
+    method?: string;
+    body?: string;
+    headers?: Record<string, string>;
+    followRedirects?: boolean;
+}): Promise<string>;
 export interface LogMessageOptions {
     /** Pre-formatted chalk tag, e.g. from `getServerPrefix()` or `PLUGIN_TAG`. */
     tag?: string;

package/lib/utils.js

@@ -40,6 +40,57 @@ export function getServerName(hostname) {
     }
     return hostname;
 }
+/**
+ * Wraps an async operation. If the caught error is a JSON parse error
+ * (SyntaxError from undici/fetch `.json()` on an HTML response), re-throws
+ * with `context` prepended so it's obvious which network call failed.
+ */
+export async function wrapJsonError(context, fn) {
+    try {
+        return await fn();
+    }
+    catch (error) {
+        if (error instanceof SyntaxError &&
+            (error.message.includes("not valid JSON") || error.message.includes("Unexpected token"))) {
+            throw new Error(`${context}: server returned non-JSON — likely an HTML redirect or error page. ` +
+                `Original parse error: ${error.message}`);
+        }
+        throw error;
+    }
+}
+/**
+ * Makes a diagnostic HTTP request and returns the full response body + metadata
+ * as a human-readable string. Used to show what the server is actually returning
+ * when a JSON-parse error occurs inside a library that swallows the response body.
+ *
+ * Pass followRedirects: true to follow the redirect chain (useful when the library
+ * auto-follows redirects and fails on the final response).
+ */
+export async function diagnoseServerResponse(url, options = {}) {
+    const method = options.method ?? "GET";
+    const redirect = options.followRedirects ? "follow" : "manual";
+    try {
+        const res = await fetch(url, {
+            method,
+            headers: { Accept: "text/html,application/json,*/*", ...options.headers },
+            body: options.body,
+            redirect,
+        });
+        const contentType = res.headers.get("content-type") ?? "(none)";
+        const location = res.headers.get("location");
+        const body = await res.text();
+        let info = `${method} ${url} → ${res.status} ${res.statusText} | Content-Type: ${contentType}`;
+        if (location)
+            info += ` | Location: ${location}`;
+        if (res.redirected)
+            info += ` | Final URL: ${res.url}`;
+        info += `\n--- Response body ---\n${body}\n--- End of body ---`;
+        return info;
+    }
+    catch (diagError) {
+        return `${method} ${url} failed: ${diagError?.message ?? diagError}`;
+    }
+}
 /**
  * Assembles a consistently-formatted log message:
  * `HH:mm:ss [tag] (source) message`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-vite",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "description": "Tools to use and deploy Vite applications to Appframe",
   "main": "./lib/index.js",
   "type": "module",
@@ -31,7 +31,7 @@
     "dotenv": "^17.2.3",
     "jsdom": "29.0.2",
     "rollup-plugin-visualizer": "^6.0.5",
-    "@olenbetong/appframe-data": "1.4.1"
+    "@olenbetong/appframe-data": "1.5.0"
   },
   "devDependencies": {
     "@types/jsdom": "^27.0.0",