@cloud-cli/px 4.2.6 → 4.2.8

package/dist/proxy-manager.d.ts

@@ -6,6 +6,7 @@ export declare class ProxyManager {
     updateProxy(options: WithOptionalProps<Proxy>): Promise<Proxy>;
     removeProxy(options: WithOptionalProps<DomainAndTarget>): Promise<boolean>;
     getDomainList(): Promise<string[]>;
+    getProxyListWithContainers(): Promise<Proxy[]>;
     getProxyList(filters?: Partial<Proxy>): Promise<Proxy[]>;
     getProxyListForDomain(options: WithOptionalProps<DomainName>): Promise<Proxy[]>;
     reload(): Promise<void>;

package/dist/proxy-manager.js

@@ -22,13 +22,15 @@ const emptyProxy = {
     domain: '',
     target: '',
     cors: false,
-    preserveHost: false,
+    preserveHost: true,
     redirect: false,
     redirectUrl: '',
     headers: '',
     authorization: '',
 };
-const readDomain = (options) => (options.domain = options.domain || options.host || options._[0]);
+const readDomain = (options) => {
+    options.domain = options.domain || options.host || options._[0];
+};
 const numberRe = /^[0-9]+$/;
 const readOption = value => {
     switch (true) {
@@ -100,10 +102,18 @@ export class ProxyManager {
         const proxies = await this.getProxyList();
         return proxies.map((proxy) => proxy.domain);
     }
-    async getProxyList(filters = {}) {
+    async getProxyListWithContainers() {
         const staticRoutes = getAll();
-        const containers = await this.getRunningContainers();
-        const list = [...staticRoutes, ...containers.map(readProxyFromContainer)];
+        const containers = (await this.getRunningContainers()).map(readProxyFromContainer);
+        const containerDomains = containers.map(c => c.domain.split('/')[0]);
+        const list = [
+            ...staticRoutes.filter(t => !containerDomains.includes(t.domain)),
+            ...containers,
+        ];
+        return list;
+    }
+    async getProxyList(filters = {}) {
+        const list = await this.getProxyListWithContainers();
         const keys = Object.keys(filters);
         if (!keys.length) {
             return list;
@@ -115,19 +125,17 @@ export class ProxyManager {
     }
     async getProxyListForDomain(options) {
         readDomain(options);
-        const all = await this.getProxyList();
-        return all.filter((p) => p.domain === options.domain);
+        const all = await this.getProxyListWithContainers();
+        return all.filter((p) => p.domain.includes(options.domain));
     }
     async reload() {
-        const targets = await getAll();
-        const containers = await this.getRunningContainers();
-        const all = [...targets, ...containers.map(readProxyFromContainer)];
+        const all = await this.getProxyListWithContainers();
         px.reset();
         for (const t of all) {
             const [domain, path = ""] = t.domain.split("/");
             px.add(new ProxyEntry({
-                domain: domain,
-                path: path,
+                domain,
+                path,
                 target: t.target,
                 redirectToHttps: t.redirect,
                 redirectToUrl: t.redirectUrl,
@@ -150,15 +158,10 @@ export class ProxyManager {
     }
 }
 function readProxyFromContainer(c) {
-    const domain = [c.labels.host, c.labels.path].join("/");
+    const domain = [c.labels.host, c.labels.path].filter(Boolean).join("/");
     const proxyOverrides = get(domain) || {};
     return {
-        redirect: true,
-        redirectUrl: "",
-        cors: true,
-        authorization: "",
-        preserveHost: false,
-        headers: "",
+        ...emptyProxy,
         ...proxyOverrides,
         domain,
         target: `http://localhost:${c.ports[0].host}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/px",
-  "version": "4.2.6",
+  "version": "4.2.8",
   "description": "Reverse Proxy",
   "main": "./dist/index.js",
   "type": "module",