@olenbetong/appframe-vite 4.0.0-rc.0 → 4.0.0

package/lib/devServer.d.ts

@@ -1,8 +1,8 @@
 import { Connect, ViteDevServer } from "vite";
-export declare function getLoginInfo(): {
+export declare function getLoginInfo(): Promise<{
     hostname: any;
     username: string;
     password: string;
-};
+}>;
 export declare function getProxyRoutes(): string[];
 export declare function createDevMiddleware(vite: ViteDevServer): Connect.NextHandleFunction;

package/lib/devServer.js

@@ -7,7 +7,8 @@ import { importJson } from "./importJson.js";
 dotenv.config();
 let appPkg = await importJson("./package.json", true);
 let { appframe } = appPkg;
-export function getLoginInfo() {
+export async function getLoginInfo() {
+    let { appframe } = await importJson("./package.json", true);
     const hostname = appframe.proxy?.hostname ?? appframe.deploy?.hostname ?? "dev.obet.no";
     const { APPFRAME_LOGIN: username, APPFRAME_PWD: password } = process.env;
     if (!username || !password) {
@@ -40,7 +41,7 @@ export function getProxyRoutes() {
     return proxyRoutes;
 }
 async function getArticleHtml() {
-    let { hostname, username, password } = getLoginInfo();
+    let { hostname, username, password } = await getLoginInfo();
     let article = appframe.article?.id;
     let client = new Client(hostname);
     await client.login(username, password);
@@ -87,6 +88,11 @@ async function getArticleHtml() {
             }
         });
         nodesToRemove.forEach((node) => node.remove());
+        dom.window.document.querySelectorAll("a").forEach((anchor) => {
+            if (anchor.href?.startsWith("/") && !anchor.href?.startsWith(`/${article}`)) {
+                anchor.href = `https://${hostname}${anchor.href}`;
+            }
+        });
         return dom.serialize();
     }
     throw Error(`Failed to get article '${article}' from '${hostname}': ${response.status} ${response.statusText}`);

package/lib/index.js

@@ -1,6 +1,27 @@
+import { watch } from "chokidar";
 import { addAppframeBuildConfig } from "./build.js";
 import { createDevMiddleware, getLoginInfo, getProxyRoutes } from "./devServer.js";
+import { importJson } from "./importJson.js";
 import { getLastSession, login } from "./proxy.js";
+let interval;
+let server;
+let lastHostname;
+try {
+    let appPkgUrl = `file://${process.cwd()}/package.json`;
+    watch(appPkgUrl).on("all", async () => {
+        if (server) {
+            let appPkg = await importJson("./package.json", true);
+            let config = appPkg.appframe;
+            let { hostname } = await getLoginInfo();
+            if (lastHostname !== hostname) {
+                server.restart(false);
+            }
+        }
+    });
+}
+catch (error) {
+    console.log(`Failed to watch package.json: ${error.message}`);
+}
 export default function appframe() {
     return {
         name: "appframe",
@@ -38,13 +59,16 @@ export default function appframe() {
             }
             let proxy = config.server?.proxy ?? {};
             let routes = getProxyRoutes();
-            let { hostname, username, password } = getLoginInfo();
+            let { hostname, username, password } = await getLoginInfo();
+            lastHostname = hostname;
             await login(hostname, username, password);
+            if (interval)
+                clearInterval(interval);
             // After changing the plugin to use the Vite proxy instead of a custom
             // express server with node-http-proxy, we can no longer ensure the requests
             // have a valid login. To reduce the amount of problems we get with expired
             // sessions, we run the login procedure every 5 minutes to renew the session.
-            setInterval(async () => {
+            interval = setInterval(async () => {
                 await login(hostname, username, password);
             }, 1000 * 60 * 5);
             for (let route of routes) {
@@ -74,6 +98,7 @@ export default function appframe() {
             return config;
         },
         async configureServer(_server) {
+            server = _server;
             return () => {
                 _server.middlewares.use(createDevMiddleware(_server));
             };

package/lib/proxy.d.ts

@@ -1,4 +1,3 @@
-import e from "express";
 type CookieObject = Record<string, string>;
 type LoginCacheEntry = {
     timestamp: number;
@@ -6,18 +5,4 @@ type LoginCacheEntry = {
 };
 export declare function getLastSession(hostname: any): LoginCacheEntry | undefined;
 export declare function login(hostname: string, username: string, password: string): Promise<CookieObject>;
-export type createProxyOptions = {
-    /**
-     * If true, will wait for the first login request to complete before returning.
-     */
-    autoLogin?: boolean;
-    hostname: string;
-    username: string;
-    password: string;
-    protocol?: "http" | "https";
-};
-export type AppframeProxy = e.RequestHandler & {
-    setHostname: (hostname: string) => Promise<void>;
-};
-export declare function createAppframeProxy(options: createProxyOptions): AppframeProxy;
 export {};

package/lib/proxy.js

@@ -1,4 +1,4 @@
-import expressProxy from "express-http-proxy";
+import chalk from "chalk";
 import https from "node:https";
 const lastLogin = new Map();
 let currentLogin = null;
@@ -17,7 +17,7 @@ export async function login(hostname, username, password) {
                 return;
             }
             else {
-                console.log("Renewing authentication cookies...");
+                process.stdout.write(`${chalk.bgBlueBright(hostname)}: Renewing authentication cookies...`);
                 lastLogin.delete(hostname);
             }
         }
@@ -33,8 +33,14 @@ export async function login(hostname, username, password) {
                 "Content-Length": data.length,
             },
         };
-        console.log("Authenticating...");
+        process.stdout.clearLine(0);
+        process.stdout.write(`\r${chalk.bgBlueBright(hostname)}: Authenticating`);
+        let start = performance.now();
+        let interval = setInterval(() => {
+            process.stdout.write(`.`);
+        }, 100);
         let request = https.request(options, (response) => {
+            clearInterval(interval);
             let status = response.statusCode ?? 600;
             if (status < 400) {
                 let cookies = response.headers["set-cookie"] ?? [];
@@ -46,7 +52,8 @@ export async function login(hostname, username, password) {
                         cookieObj[key] = value;
                     }
                 }
-                console.log("Authentication successfull.");
+                process.stdout.clearLine(0);
+                process.stdout.write(`\r${chalk.bgBlueBright(hostname)}: Authenticated (${Math.floor(performance.now() - start)}ms)\n`);
                 lastLogin.set(hostname, {
                     timestamp: Date.now(),
                     authCookies: cookieObj,
@@ -54,7 +61,7 @@ export async function login(hostname, username, password) {
                 resolve(cookieObj);
             }
             else {
-                reject(Error(`Authentication failed: ${response.statusCode} ${response.statusMessage}`));
+                reject(Error(`${chalk.bgBlueBright(hostname)}: Authentication failed: ${response.statusCode} ${response.statusMessage}`));
             }
         });
         request.write(data);
@@ -74,32 +81,3 @@ export async function login(hostname, username, password) {
         throw error;
     }
 }
-export function createAppframeProxy(options) {
-    let { hostname, password, protocol = "https", username } = options;
-    // @ts-ignore
-    const proxy = expressProxy(() => `${protocol}://${hostname}`, {
-        memoizeHost: false,
-        proxyReqOptDecorator: async function (proxyReqOpts) {
-            if (!proxyReqOpts.path?.startsWith("/login")) {
-                let authCookies = await login(hostname, username, password);
-                let cookies = [];
-                cookies.push(`AppframeWebAuth=${authCookies["AppframeWebAuth"]}`);
-                cookies.push(`AppframeWebSession=${authCookies["AppframeWebSession"]}`);
-                proxyReqOpts.headers = proxyReqOpts.headers ?? {};
-                proxyReqOpts.headers["cookie"] = cookies.join(";");
-            }
-            return proxyReqOpts;
-        },
-        proxyReqPathResolver: function (req) {
-            return req.originalUrl;
-        },
-    });
-    proxy.setHostname = async (newHostname) => {
-        if (hostname !== newHostname) {
-            hostname = newHostname;
-            console.log(`Changing proxy host to '${newHostname}'...`);
-            await login(hostname, username, password);
-        }
-    };
-    return proxy;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@olenbetong/appframe-vite",
-	"version": "4.0.0-rc.0",
+	"version": "4.0.0",
 	"description": "Tools to use and deploy Vite applications to Appframe",
 	"main": "./lib/index.js",
 	"type": "module",
@@ -20,6 +20,7 @@
 	"license": "MIT",
 	"dependencies": {
 		"@olenbetong/appframe-data": "^0.8.10",
+		"chalk": "^5.3.0",
 		"chokidar": "^3.5.3",
 		"dotenv": "^16.3.1",
 		"jsdom": "^22.1.0",
@@ -42,5 +43,5 @@
 		"open": "^9.1.0",
 		"tcp-port-used": "^1.0.2"
 	},
-	"gitHead": "0875957c231dcd1c5b3e765f45d5a3017c1e30b3"
+	"gitHead": "d4c8d2d9010a49c9052947bbf7593c6bd13af9b4"
 }