@olenbetong/appframe-vite 3.0.11 → 3.1.1

package/lib/devServer.js

@@ -1,4 +1,5 @@
 import { Client } from "@olenbetong/appframe-data";
+import { watch } from "chokidar";
 import dotenv from "dotenv";
 import express from "express";
 import fs from "node:fs/promises";
@@ -15,7 +16,7 @@ async function getUserSession() {
     if (userSession) {
         return userSession;
     }
-    let { hostname, username, password } = getLoginInfo();
+    let { hostname, username, password } = await getLoginInfo();
     let client = new Client(hostname);
     await client.login(username, password);
     let userResult = await client.afFetch("/api/system/usersession", {
@@ -35,6 +36,18 @@ function getLoginInfo() {
 export function createProxyMiddleware() {
     let { hostname, username, password } = getLoginInfo();
     const proxy = createAppframeProxy({ hostname, username, password });
+    try {
+        let appPkgUrl = `file://${process.cwd()}/package.json`;
+        watch(appPkgUrl).on("all", async () => {
+            appPkg = await importJson("./package.json", true);
+            appframe = appPkg.appframe;
+            let { hostname } = getLoginInfo();
+            proxy.setHostname(hostname);
+        });
+    }
+    catch (error) {
+        console.log(`Failed to watch package.json: ${error.message}`);
+    }
     const proxyRoutes = [
         "/api/*",
         "/file/*",

package/lib/index.js

@@ -29,7 +29,8 @@ export default function appframe() {
             return config;
         },
         async configureServer(_server) {
-            _server.middlewares.use(createProxyMiddleware());
+            let proxyMiddleware = createProxyMiddleware();
+            _server.middlewares.use(proxyMiddleware);
             return () => {
                 _server.middlewares.use(createDevMiddleware(_server));
             };

package/lib/proxy.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="qs" />
-/// <reference types="express" />
+import e from "express";
 type CookieObject = Record<string, string>;
 export declare function login(hostname: string, username: string, password: string): Promise<CookieObject>;
 export type createProxyOptions = {
@@ -12,5 +11,8 @@ export type createProxyOptions = {
     password: string;
     protocol?: "http" | "https";
 };
-export declare function createAppframeProxy(options: createProxyOptions): import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+export type AppframeProxy = e.RequestHandler & {
+    setHostname: (hostname: string) => Promise<void>;
+};
+export declare function createAppframeProxy(options: createProxyOptions): AppframeProxy;
 export {};

package/lib/proxy.js

@@ -4,7 +4,7 @@ const lastLogin = new Map();
 let currentLogin = null;
 export async function login(hostname, username, password) {
     if (currentLogin) {
-        return await currentLogin;
+        await currentLogin;
     }
     let loginPromise = new Promise((resolve, reject) => {
         if (lastLogin.has(hostname)) {
@@ -72,8 +72,10 @@ export async function login(hostname, username, password) {
     }
 }
 export function createAppframeProxy(options) {
-    const { hostname, password, protocol = "https", username } = options;
-    const proxy = expressProxy(`${protocol}://${hostname}`, {
+    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);
@@ -89,5 +91,12 @@ export function createAppframeProxy(options) {
             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": "3.0.11",
+	"version": "3.1.1",
 	"description": "Tools to use and deploy Vite applications to Appframe",
 	"main": "./lib/index.js",
 	"type": "module",
@@ -19,7 +19,8 @@
 	"author": "Bjørnar Vister Hansen <bvh@olenbetong.no>",
 	"license": "MIT",
 	"dependencies": {
-		"@olenbetong/appframe-data": "^0.7.15",
+		"@olenbetong/appframe-data": "^0.7.16",
+		"chokidar": "^3.5.3",
 		"dotenv": "^16.0.3",
 		"rollup-plugin-visualizer": "^5.9.0",
 		"vite-plugin-externals": "^0.5.1"
@@ -39,5 +40,5 @@
 		"open": "^8.4.0",
 		"tcp-port-used": "^1.0.2"
 	},
-	"gitHead": "c9a3c6f1b6e85fbac7c520be6df3f7e919c44584"
+	"gitHead": "49054954b937cf12215f72bda93dc2acd3c89846"
 }