@cloud-cli/px 3.5.4 → 3.5.6

package/dist/proxy-manager.d.ts

@@ -23,5 +23,6 @@ export declare class ProxyManager {
     getDomainList(): Promise<string[]>;
     getProxyList(): Promise<Proxy[]>;
     getProxyListForDomain(options: Domain): Promise<Proxy[]>;
+    private findByDomainAndPath;
 }
 export {};

package/dist/proxy-manager.js

@@ -11,8 +11,10 @@ export class ProxyManager {
             if (!proxy.target && !proxy.redirectUrl) {
                 return reject(targetNotSpecifiedError);
             }
+            const [domain, path = ''] = (proxy.domain || proxy.host).split('/');
             const entry = new Proxy({
-                domain: proxy.domain || proxy.host,
+                domain: domain,
+                path: path,
                 target: proxy.target,
                 cors: !!proxy.cors,
                 redirect: !!proxy.redirect,
@@ -29,33 +31,30 @@ export class ProxyManager {
         });
     }
     async updateProxy(options) {
-        const domain = options.domain || options.host;
-        const query = new Query().where('domain').is(domain);
-        const proxies = await Resource.find(Proxy, query);
+        const host = options.domain || options.host;
+        const proxies = await this.findByDomainAndPath(host);
         if (!proxies.length) {
-            proxies.push(new Proxy({ domain }));
+            const [domain, path = ''] = host.split('/');
+            proxies.push(new Proxy({ domain, path }));
         }
         for (const proxy of proxies) {
-            ['target', 'cors', 'redirect', 'redirectUrl'].forEach(p => p in options && (proxy[p] = options[p]));
+            ['target', 'cors', 'redirect', 'redirectUrl'].forEach((p) => p in options && (proxy[p] = options[p]));
             await proxy.save();
         }
         return true;
     }
     removeProxy(options) {
         return new Promise(async (resolve, reject) => {
-            if (!options.domain && !options.host) {
+            const host = options.domain || options.host;
+            if (!host) {
                 return reject(domainNotSpecifiedError);
             }
-            const query = new Query().where('domain').is(options.domain || options.host);
-            if (options.target) {
-                query.where('target').is(options.target);
-            }
-            const proxy = await Resource.find(Proxy, query);
+            const proxies = await this.findByDomainAndPath(host);
             try {
-                for (const p of proxy) {
+                for (const p of proxies) {
                     await p.remove();
                 }
-                resolve(true);
+                resolve({ found: proxies.length });
             }
             catch (error) {
                 reject(error);
@@ -64,12 +63,19 @@ export class ProxyManager {
     }
     async getDomainList() {
         const proxies = await Resource.find(Proxy, new Query());
-        return proxies.map((proxy) => proxy.domain);
+        const list = proxies.map((proxy) => proxy.domain);
+        return [...new Set(list)];
     }
     async getProxyList() {
         return Resource.find(Proxy, new Query());
     }
     getProxyListForDomain(options) {
-        return Resource.find(Proxy, new Query().where('domain').is(options.domain || options.host));
+        return this.findByDomainAndPath(options.domain || options.host);
+    }
+    async findByDomainAndPath(string) {
+        const [domain, path = ''] = string.split('/');
+        const query = new Query().where('domain').is(domain).where('path').is(path);
+        const proxies = await Resource.find(Proxy, query);
+        return proxies;
     }
 }

package/package.json

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