@cloud-cli/px 4.2.1 → 4.2.3

package/dist/index.d.ts

@@ -5,7 +5,7 @@ declare const _default: {
     remove(options: WithOptionalProps<DomainAndTarget>): Promise<boolean>;
     update(options: WithOptionalProps<Proxy>): Promise<Proxy>;
     list(filters: Partial<Proxy>): Promise<Proxy[]>;
-    get(options: DomainName): Proxy[];
+    get(options: DomainName): Promise<Proxy[]>;
     domains(): Promise<string[]>;
     [init](): Promise<import("@cloud-cli/proxy").ProxyServer>;
     reload(): Promise<void>;

package/dist/proxy-manager.d.ts

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

package/dist/proxy-manager.js

@@ -97,11 +97,13 @@ export class ProxyManager {
         return false;
     }
     async getDomainList() {
-        const proxies = getAll();
+        const proxies = await this.getProxyList();
         return proxies.map((proxy) => proxy.domain);
     }
     async getProxyList(filters = {}) {
-        const list = getAll();
+        const staticRoutes = getAll();
+        const containers = await this.getRunningContainers();
+        const list = [...staticRoutes, ...containers.map(readProxyFromContainer)];
         const keys = Object.keys(filters);
         if (!keys.length) {
             return list;
@@ -111,15 +113,17 @@ export class ProxyManager {
             return list.filter((p) => String(p[key]).toLowerCase().includes(filter));
         }, list);
     }
-    getProxyListForDomain(options) {
+    async getProxyListForDomain(options) {
         readDomain(options);
-        const all = getAll();
+        const all = await this.getProxyList();
         return all.filter((p) => p.domain === options.domain);
     }
     async reload() {
         const targets = await getAll();
+        const containers = await this.getRunningContainers();
+        const all = [...targets, ...containers.map(readProxyFromContainer)];
         px.reset();
-        for (const t of targets) {
+        for (const t of all) {
             const [domain, path = ""] = t.domain.split("/");
             px.add(new ProxyEntry({
                 domain: domain,
@@ -133,29 +137,30 @@ export class ProxyManager {
                 preserveHost: t.preserveHost,
             }));
         }
-        const dockerTargets = await this.getRunningContainers();
-        for (const t of dockerTargets) {
-            if (!t.ports.length || !t.labels.host)
-                continue;
-            px.add(new ProxyEntry({
-                domain: t.labels.host,
-                path: t.labels.path || '',
-                target: `http://localhost:${t.ports[0].host}`,
-                redirectToHttps: true,
-                cors: true,
-            }));
-        }
         px.start();
     }
     async getRunningContainers() {
         const ps = await exec("docker", ["ps", "-aq"]);
         const ids = ps.stdout.trim().split("\n");
-        const format = '--format="{{.Id}},{{.Name}},{{.State.Status}},{{.Image}}"';
-        const state = await exec("docker", ["inspect", format, ...ids]);
+        const state = await exec("docker", ["inspect", ...ids]);
         const json = JSON.parse(state.stdout);
-        return json.map(readDockerContainer);
+        return json
+            .map(readDockerContainer)
+            .filter(d => d.ports.length && !d.labels.host);
     }
 }
+function readProxyFromContainer(c) {
+    return {
+        domain: [c.labels.host, c.labels.path].join("/"),
+        target: `http://localhost:${c.ports[0].host}`,
+        redirect: true,
+        redirectUrl: "",
+        cors: true,
+        authorization: "",
+        preserveHost: false,
+        headers: "",
+    };
+}
 function readDockerContainer(d) {
     const labels = Object.fromEntries(Object.entries(d.Config.Labels)
         .filter(([key]) => key.startsWith("px:"))

package/package.json

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