@olenbetong/appframe-vite 1.0.3 → 1.0.7

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Ølen Betong
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/lib/build.js

@@ -2,17 +2,16 @@ import { visualizer } from "rollup-plugin-visualizer";
 import { viteExternalsPlugin } from "vite-plugin-externals";
 import { importJson } from "./importJson.js";
 export async function addAppframeBuildConfig(config) {
-    var _a, _b;
     let appPkg = await importJson("./package.json", true);
     let { appframe } = appPkg;
-    config.build = (_a = config.build) !== null && _a !== void 0 ? _a : {};
+    config.build = config.build ?? {};
     config.build = {
         ...config.build,
         manifest: true,
         sourcemap: true,
         cssCodeSplit: false,
     };
-    config.plugins = (_b = config.plugins) !== null && _b !== void 0 ? _b : [];
+    config.plugins = config.plugins ?? [];
     if (appframe.build.externals !== false) {
         config.plugins.push(viteExternalsPlugin({
             react: "React",

package/lib/devServer.d.ts

@@ -1,6 +1,6 @@
 import { Application, RequestHandler, Router } from "express";
 import { ViteDevServer } from "vite";
-export declare function createProxyMiddleware(): Promise<Router>;
+export declare function createProxyMiddleware(): Router;
 export declare function createHtmlTransformer(): (html: string) => Promise<string>;
-export declare function createDevMiddleware(vite: ViteDevServer): Promise<RequestHandler>;
+export declare function createDevMiddleware(vite: ViteDevServer): RequestHandler;
 export declare function startDevServer(app: Application): Promise<void>;

package/lib/devServer.js

@@ -4,17 +4,18 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import open from "open";
 import tcpPortUsed from "tcp-port-used";
-import { Client } from "@olenbetong/data-object";
+import { Client } from "@olenbetong/appframe-data";
 import { importJson } from "./importJson.js";
 import { createAppframeProxy } from "./proxy.js";
 dotenv.config();
 let appPkg = await importJson("./package.json", true);
 let { appframe } = appPkg;
 let userSession = null;
-async function getUserSession(hostname, username, password) {
+async function getUserSession() {
     if (userSession) {
         return userSession;
     }
+    let { hostname, username, password } = getLoginInfo();
     let client = new Client(hostname);
     await client.login(username, password);
     let userResult = await client.afFetch("/api/system/usersession", {
@@ -23,15 +24,17 @@ async function getUserSession(hostname, username, password) {
     userSession = await userResult.json();
     return userSession;
 }
-export async function createProxyMiddleware() {
-    var _a, _b, _c, _d, _e;
-    const hostname = (_d = (_b = (_a = appframe.proxy) === null || _a === void 0 ? void 0 : _a.hostname) !== null && _b !== void 0 ? _b : (_c = appframe.deploy) === null || _c === void 0 ? void 0 : _c.hostname) !== null && _d !== void 0 ? _d : "dev.obet.no";
+function getLoginInfo() {
+    const hostname = appframe.proxy?.hostname ?? appframe.deploy?.hostname ?? "dev.obet.no";
     const { APPFRAME_LOGIN: username, APPFRAME_PWD: password } = process.env;
-    const router = express.Router();
     if (!username || !password) {
         throw new Error("Your Appframe credentials are not set in the environment variables. Username should be set in APPFRAME_LOGIN and password in APPFRAME_PWD.");
     }
-    const proxy = await createAppframeProxy({ hostname, username, password });
+    return { hostname, username, password };
+}
+export function createProxyMiddleware() {
+    let { hostname, username, password } = getLoginInfo();
+    const proxy = createAppframeProxy({ hostname, username, password });
     const proxyRoutes = [
         "/api/*",
         "/file/*",
@@ -47,24 +50,19 @@ export async function createProxyMiddleware() {
         "/rowcount/*",
         "/lib/*"
     ];
-    if ((_e = appframe.proxy) === null || _e === void 0 ? void 0 : _e.routes) {
+    if (appframe.proxy?.routes) {
         proxyRoutes.push(...appframe.proxy.routes);
     }
+    const router = express.Router();
     proxyRoutes.forEach(route => {
         router.use(route, proxy);
     });
     return router;
 }
 export function createHtmlTransformer() {
-    var _a, _b, _c, _d, _e, _f;
-    const hostname = (_d = (_b = (_a = appframe.proxy) === null || _a === void 0 ? void 0 : _a.hostname) !== null && _b !== void 0 ? _b : (_c = appframe.deploy) === null || _c === void 0 ? void 0 : _c.hostname) !== null && _d !== void 0 ? _d : "dev.obet.no";
-    const { APPFRAME_LOGIN: username, APPFRAME_PWD: password } = process.env;
-    let isPartner = ((_f = (_e = appPkg.appframe) === null || _e === void 0 ? void 0 : _e.article) === null || _f === void 0 ? void 0 : _f.hostname) === "partner.olenbetong.no";
-    if (!username || !password) {
-        throw new Error("Your Appframe credentials are not set in the environment variables. Username should be set in APPFRAME_LOGIN and password in APPFRAME_PWD.");
-    }
     return async (html) => {
-        let userSession = await getUserSession(hostname, username, password);
+        let isPartner = appPkg.appframe?.article?.hostname === "partner.olenbetong.no";
+        let userSession = await getUserSession();
         return html
             .replace("<!-- {Appframe} -->", `<script>
 af = globalThis.af ?? {};
@@ -88,14 +86,14 @@ af.userSession = ${JSON.stringify(userSession)};
       <link rel="stylesheet" href="/file/site/style/ob.es.application.min.css" />`);
     };
 }
-export async function createDevMiddleware(vite) {
-    let transformer = await createHtmlTransformer();
+export function createDevMiddleware(vite) {
     return async (req, res, next) => {
+        let transformer = createHtmlTransformer();
         const url = req.originalUrl;
         try {
             let template = await fs.readFile(path.resolve(process.cwd(), "index.html"), "utf-8");
             template = await vite.transformIndexHtml(url, template);
-            let html = transformer(template);
+            let html = await transformer(template);
             res.status(200).set({ "Content-Type": "text/html" }).end(html);
         }
         catch (error) {

package/lib/index.js

@@ -17,9 +17,9 @@ export default function appframe() {
             return config;
         },
         async configureServer(_server) {
-            _server.middlewares.use(await createProxyMiddleware());
-            return async () => {
-                _server.middlewares.use(await createDevMiddleware(_server));
+            _server.middlewares.use(createProxyMiddleware());
+            return () => {
+                _server.middlewares.use(createDevMiddleware(_server));
             };
         },
         transformIndexHtml

package/lib/proxy.d.ts

@@ -11,4 +11,4 @@ export declare type createProxyOptions = {
     password: string;
     protocol?: "http" | "https";
 };
-export declare function createAppframeProxy(options: createProxyOptions): Promise<import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>>;
+export declare function createAppframeProxy(options: createProxyOptions): import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;

package/lib/proxy.js

@@ -32,10 +32,9 @@ export async function login(hostname, username, password) {
         };
         console.log("Authenticating...");
         let request = https.request(options, response => {
-            var _a, _b;
-            let status = (_a = response.statusCode) !== null && _a !== void 0 ? _a : 600;
+            let status = response.statusCode ?? 600;
             if (status < 400) {
-                let cookies = (_b = response.headers["set-cookie"]) !== null && _b !== void 0 ? _b : [];
+                let cookies = response.headers["set-cookie"] ?? [];
                 let cookieObj = {};
                 for (let cookie of cookies) {
                     let [keyValue] = cookie.split(";");
@@ -63,17 +62,16 @@ export async function login(hostname, username, password) {
     currentLogin = null;
     return result;
 }
-export async function createAppframeProxy(options) {
-    const { autoLogin = true, hostname, password, protocol = "https", username } = options;
+export function createAppframeProxy(options) {
+    const { hostname, password, protocol = "https", username } = options;
     const proxy = expressProxy(`${protocol}://${hostname}`, {
         proxyReqOptDecorator: async function (proxyReqOpts) {
-            var _a, _b;
-            if (!((_a = proxyReqOpts.path) === null || _a === void 0 ? void 0 : _a.startsWith("/login"))) {
+            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 = (_b = proxyReqOpts.headers) !== null && _b !== void 0 ? _b : {};
+                proxyReqOpts.headers = proxyReqOpts.headers ?? {};
                 proxyReqOpts.headers["cookie"] = cookies.join(";");
             }
             return proxyReqOpts;
@@ -82,8 +80,5 @@ export async function createAppframeProxy(options) {
             return req.originalUrl;
         }
     });
-    if (autoLogin) {
-        await login(hostname, username, password);
-    }
     return proxy;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-vite",
-  "version": "1.0.3",
+  "version": "1.0.7",
   "description": "Tools to use and deploy Vite applications to Appframe",
   "main": "./lib/index.js",
   "type": "module",
@@ -19,6 +19,7 @@
   "author": "Bjørnar Vister Hansen <bvh@olenbetong.no>",
   "license": "MIT",
   "dependencies": {
+    "@olenbetong/appframe-data": "^0.1.2",
     "dotenv": "^16.0.1",
     "rollup-plugin-visualizer": "^5.6.0",
     "vite-plugin-externals": "^0.5.0"
@@ -31,12 +32,12 @@
     "vite": "^2.9.9"
   },
   "optionalDependencies": {
-    "@olenbetong/data-object": "^1.0.0-alpha.65",
     "@types/express": "^4.17.13",
     "@types/express-http-proxy": "^1.6.3",
     "@types/tcp-port-used": "^1.0.1",
     "express-http-proxy": "^1.6.3",
     "open": "^8.4.0",
     "tcp-port-used": "^1.0.2"
-  }
+  },
+  "gitHead": "f7d752c4547e6f17d91fa83717175cd21d90b05f"
 }