@uniformdev/redirect 19.27.0 → 19.29.0

package/dist/index.d.ts

@@ -98,6 +98,8 @@ declare class RedirectClient extends ApiClient<RedirectClientOptions> {
     static processUrlBestMatch: (url: string, trie: PathTrie<DirectionAwareRedirectDefinition>, options?: RedirectOptions) => Promise<RedirectResult | undefined>;
     processUrlBestMatch: (url: string, options?: RedirectOptions) => Promise<RedirectResult | undefined>;
     processUrlAllMatches: (url: string, options?: RedirectOptions) => Promise<RedirectResult[]>;
+    private static assembling;
+    private static assemblingPromise;
     private assembleTrie;
     private static processHops;
     private static processHop;
@@ -391,6 +393,7 @@ type RedirectClientGetRedirect = Pick<RedirectClientGetRequest, 'id' | 'projectM
 type RedirectClientGetRedirects = Pick<RedirectClientGetRequest, 'ids' | 'limit' | 'offset' | 'orderBy' | 'search'>;
 
 declare class WithMemoryCache extends RedirectClientCache<RedirectClientCacheOptions> {
+    private static refresher?;
     constructor(options: RedirectClientCacheOptions);
     private static trieCache;
     get(key: string): Promise<PathTrie<DirectionAwareRedirectDefinition>> | undefined;

package/dist/index.esm.js

@@ -1,5 +1,43 @@
 import "./chunk-FFYIGW52.mjs";
 
+// src/cache/data/refresher.ts
+var Refresher = class {
+  /**
+   * Create new refresher
+   * @param refreshRate - How often the refresher will refresh. Cannot be less than 20000 ms or 20 seconds
+   * @param refreshDuration - How many times it should refresh before sleeps until something accesses the cache. Cannot be more than 5
+   * @param refresh - Refresh method to run at the refresh rate intervals
+   */
+  constructor({ refreshRate, refreshDuration, refresh }) {
+    this.refreshCounter = 0;
+    this.finalRate = refreshRate >= 2e4 ? refreshRate : 2e4;
+    this.finalDuration = refreshDuration <= 5 ? refreshDuration : 5;
+    this.refreshCounter = 1;
+    this.refresh = refresh;
+    this.start();
+  }
+  /**
+   * Start async updating process again, will run for the same duration as the original.  refreshRate * refreshDuration milliseconds
+   */
+  kick() {
+    if (this.refreshCounter === 0) {
+      this.start();
+    }
+    this.refreshCounter = 1;
+  }
+  start() {
+    this.interval = setTimeout(async () => {
+      if (this.refreshCounter > this.finalDuration) {
+        this.refreshCounter = 0;
+      } else {
+        await this.refresh();
+        this.refreshCounter++;
+        this.start();
+      }
+    }, this.finalRate);
+  }
+};
+
 // src/cache/redirectClientCache.ts
 var RedirectClientCache = class {
   constructor(options) {
@@ -11,11 +49,19 @@ var RedirectClientCache = class {
 var _WithMemoryCache = class extends RedirectClientCache {
   constructor(options) {
     super(options);
+    if (options.refreshRate && !_WithMemoryCache.refresher) {
+      _WithMemoryCache.refresher = new Refresher({
+        refreshRate: options.refreshRate,
+        refreshDuration: 5,
+        refresh: this.refresh
+      });
+    }
   }
   /* Get data from the cache and debounce pausing refresh */
   get(key) {
-    var _a, _b;
-    return (_b = (_a = _WithMemoryCache.trieCache[key]) == null ? void 0 : _a.data) != null ? _b : void 0;
+    var _a, _b, _c;
+    (_a = _WithMemoryCache.refresher) == null ? void 0 : _a.kick();
+    return (_c = (_b = _WithMemoryCache.trieCache[key]) == null ? void 0 : _b.data) != null ? _c : void 0;
   }
   /* Set new data to the cache and reset the refresh method */
   set(key, data, refresh) {
@@ -39,13 +85,15 @@ var _WithMemoryCache = class extends RedirectClientCache {
   }
   refresh() {
     var _a, _b;
+    const caches = [];
     for (const key in _WithMemoryCache.trieCache) {
       const p = (_b = (_a = _WithMemoryCache.trieCache[key]) == null ? void 0 : _a.refresh) == null ? void 0 : _b.call(_a);
       if (p) {
         _WithMemoryCache.trieCache[key] = { ..._WithMemoryCache.trieCache[key], data: p };
+        caches.push(p.then());
       }
     }
-    return Promise.all([]);
+    return Promise.all(caches);
   }
 };
 var WithMemoryCache = _WithMemoryCache;
@@ -130,7 +178,7 @@ var PathTrie = class {
       }
       return result;
     };
-    const scanWildcards = () => {
+    const scanWildcards = (i) => {
       let wildcard = void 0;
       while ((!wildcard || wildcard.active) && wildcards.length) {
         wildcard = wildcards.pop();
@@ -140,6 +188,11 @@ var PathTrie = class {
       wildcard.active = true;
       cur = wildcard == null ? void 0 : wildcard.startTrie;
       wildcards.push(wildcard);
+      if (i === segments.length - 1 && wildcards.length && wildcards[wildcards.length - 1].active && wildcards[wildcards.length - 1].startTrie[dataProp]) {
+        wildcards[wildcards.length - 1].startTrie[dataProp].forEach(
+          (d) => ret.push({ data: d, variables: getVariables() })
+        );
+      }
       return wildcard == null ? void 0 : wildcard.start;
     };
     for (let i = 0; i < segments.length; i++) {
@@ -168,21 +221,22 @@ var PathTrie = class {
         if (i === segments.length - 1) {
           if (cur[dataProp]) {
             cur[dataProp].forEach((d) => ret.push({ data: d, variables: getVariables() }));
+          } else {
+            const more = scanWildcards(i);
+            if (typeof more === "undefined" || ret.length > 0 && bestMatch)
+              return [...ret, ...splats];
+            i = more;
           }
         }
-      } else if (i === segments.length - 1) {
-        const more = scanWildcards();
-        if (typeof more === "undefined")
+      } else {
+        const more = scanWildcards(i);
+        if (typeof more === "undefined" || ret.length > 0 && bestMatch)
           return [...ret, ...splats];
         i = more;
-        if (i === segments.length - 1 && wildcards.length && wildcards[wildcards.length - 1].active && wildcards[wildcards.length - 1].startTrie[dataProp]) {
-          wildcards[wildcards.length - 1].startTrie[dataProp].forEach(
-            (d) => ret.push({ data: d, variables: getVariables() })
-          );
-        }
-      } else {
-        const more = scanWildcards();
-        if (typeof more === "undefined")
+      }
+      if (i === segments.length - 1 && wildcards.length !== 0) {
+        const more = scanWildcards(i);
+        if (typeof more === "undefined" || ret.length > 0 && bestMatch)
           return [...ret, ...splats];
         i = more;
       }
@@ -342,22 +396,29 @@ var _RedirectClient = class extends ApiClient {
     }
   }
   async assembleTrie() {
-    const trie = new PathTrie();
-    for await (const redirect of this.getAllRedirects()) {
-      const source = processUrl(redirect.redirect.sourceUrl);
-      const target = processUrl(redirect.redirect.targetUrl);
-      trie.insert(source.path, {
-        redirect: redirect.redirect,
-        metadata: redirect.metadata,
-        reverse: false
-      });
-      trie.insert(target.path, {
-        redirect: redirect.redirect,
-        metadata: redirect.metadata,
-        reverse: true
-      });
+    if (!_RedirectClient.assembling) {
+      _RedirectClient.assembling = true;
+      _RedirectClient.assemblingPromise = (async () => {
+        const trie = new PathTrie();
+        for await (const redirect of this.getAllRedirects()) {
+          const source = processUrl(redirect.redirect.sourceUrl);
+          const target = processUrl(redirect.redirect.targetUrl);
+          trie.insert(source.path, {
+            redirect: redirect.redirect,
+            metadata: redirect.metadata,
+            reverse: false
+          });
+          trie.insert(target.path, {
+            redirect: redirect.redirect,
+            metadata: redirect.metadata,
+            reverse: true
+          });
+        }
+        _RedirectClient.assembling = false;
+        return trie;
+      })();
     }
-    return trie;
+    return await _RedirectClient.assemblingPromise;
   }
   static processHops(url, trie, bestMatch, options) {
     var _a;
@@ -429,20 +490,14 @@ var _RedirectClient = class extends ApiClient {
    * @param options - Different options available to the redirect engine
    */
   static processDefinitionToResults(processedUrl, definition, variables, options) {
-    var _a, _b, _c, _d, _e;
     const resultUrl = (options == null ? void 0 : options.reverse) ? definition.redirect.sourceUrl : definition.redirect.targetUrl;
     const processedResult = processUrl(resultUrl);
     const redirect = definition == null ? void 0 : definition.redirect;
     if (redirect.sourceMustMatchDomain && processedUrl.domain !== processedResult.domain)
       return void 0;
-    const protocol = redirect.targetPreserveIncomingProtocol ? processedUrl.protocol : (_b = (_a = processedResult.protocol) != null ? _a : processedUrl.protocol) != null ? _b : "";
-    const domain = redirect.targetPreserveIncomingDomain ? processedUrl.domain : (_d = (_c = processedResult.domain) != null ? _c : processedUrl.domain) != null ? _d : "";
-    const queryString = redirect.sourceRetainQuerystring && processedResult.query ? (_e = processedResult.query) != null ? _e : "" : definition.redirect.sourceRetainQuerystring ? processedUrl.query : "";
-    const finalUrl = `${protocol}${domain}${processedResult.port}${processedResult.path}${queryString}`;
+    const finalUrl = _RedirectClient.getTargetVariableExpandedUrl(processedUrl.url, redirect);
     return {
-      url: variables.reduce((cur, o) => {
-        return cur.replace(o.key, o.value);
-      }, finalUrl),
+      url: finalUrl,
       definition,
       label: (options == null ? void 0 : options.label) ? variables.reduce((cur, o) => {
         return cur.replace(o.key, `<em>${o.value}</em>`);
@@ -477,7 +532,7 @@ var _RedirectClient = class extends ApiClient {
     }
     const protocol = redirectDefinition.targetPreserveIncomingProtocol ? processedUrl.protocol : processedTarget.protocol;
     const domain = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.domain : processedTarget.domain;
-    const port = processedTarget.port;
+    const port = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.port : processedTarget.port;
     const query = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.query, processedTarget.query) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.query : processedTarget.query;
     const fragment = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.fragment, processedTarget.fragment) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.fragment : processedTarget.fragment;
     return `${protocol}${domain}${port}${finalUrlPath}${query}${fragment}`;
@@ -499,15 +554,15 @@ var _RedirectClient = class extends ApiClient {
       return (fragment ? "#" : "?") + merged;
     return "";
   }
-  static getSourceVariables(path, source, isVariable = (pathSegment) => pathSegment.startsWith(":")) {
+  static getSourceVariables(path, source, isVariable = (pathSegment, isLast) => pathSegment.startsWith(":") || pathSegment === "*" && isLast) {
     const variables = {};
     const pathSegments = path.split("/");
     const sourceSegments = source.split("/");
-    if (pathSegments.length !== sourceSegments.length) {
+    if (pathSegments.length !== sourceSegments.length && !source.endsWith("/*")) {
       throw new Error("Path and source have different numbers of path segments, must be the same");
     }
     sourceSegments.forEach((sourceSegment, i) => {
-      if (isVariable(sourceSegment)) {
+      if (isVariable(sourceSegment, i === sourceSegments.length - 1)) {
         variables[sourceSegment] = pathSegments[i];
       }
     });
@@ -519,6 +574,10 @@ RedirectClient.processUrlBestMatch = async (url, trie, options) => {
   var _a;
   return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
 };
+RedirectClient.assembling = false;
+RedirectClient.assemblingPromise = new Promise(
+  () => new PathTrie()
+);
 var UncachedRedirectClient = class extends RedirectClient {
   constructor(options) {
     super({ ...options, bypassCache: true });

package/dist/index.js

@@ -326,6 +326,44 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
+// src/cache/data/refresher.ts
+var Refresher = class {
+  /**
+   * Create new refresher
+   * @param refreshRate - How often the refresher will refresh. Cannot be less than 20000 ms or 20 seconds
+   * @param refreshDuration - How many times it should refresh before sleeps until something accesses the cache. Cannot be more than 5
+   * @param refresh - Refresh method to run at the refresh rate intervals
+   */
+  constructor({ refreshRate, refreshDuration, refresh }) {
+    this.refreshCounter = 0;
+    this.finalRate = refreshRate >= 2e4 ? refreshRate : 2e4;
+    this.finalDuration = refreshDuration <= 5 ? refreshDuration : 5;
+    this.refreshCounter = 1;
+    this.refresh = refresh;
+    this.start();
+  }
+  /**
+   * Start async updating process again, will run for the same duration as the original.  refreshRate * refreshDuration milliseconds
+   */
+  kick() {
+    if (this.refreshCounter === 0) {
+      this.start();
+    }
+    this.refreshCounter = 1;
+  }
+  start() {
+    this.interval = setTimeout(async () => {
+      if (this.refreshCounter > this.finalDuration) {
+        this.refreshCounter = 0;
+      } else {
+        await this.refresh();
+        this.refreshCounter++;
+        this.start();
+      }
+    }, this.finalRate);
+  }
+};
+
 // src/cache/redirectClientCache.ts
 var RedirectClientCache = class {
   constructor(options) {
@@ -337,11 +375,19 @@ var RedirectClientCache = class {
 var _WithMemoryCache = class extends RedirectClientCache {
   constructor(options) {
     super(options);
+    if (options.refreshRate && !_WithMemoryCache.refresher) {
+      _WithMemoryCache.refresher = new Refresher({
+        refreshRate: options.refreshRate,
+        refreshDuration: 5,
+        refresh: this.refresh
+      });
+    }
   }
   /* Get data from the cache and debounce pausing refresh */
   get(key) {
-    var _a, _b;
-    return (_b = (_a = _WithMemoryCache.trieCache[key]) == null ? void 0 : _a.data) != null ? _b : void 0;
+    var _a, _b, _c;
+    (_a = _WithMemoryCache.refresher) == null ? void 0 : _a.kick();
+    return (_c = (_b = _WithMemoryCache.trieCache[key]) == null ? void 0 : _b.data) != null ? _c : void 0;
   }
   /* Set new data to the cache and reset the refresh method */
   set(key, data, refresh) {
@@ -365,13 +411,15 @@ var _WithMemoryCache = class extends RedirectClientCache {
   }
   refresh() {
     var _a, _b;
+    const caches = [];
     for (const key in _WithMemoryCache.trieCache) {
       const p = (_b = (_a = _WithMemoryCache.trieCache[key]) == null ? void 0 : _a.refresh) == null ? void 0 : _b.call(_a);
       if (p) {
         _WithMemoryCache.trieCache[key] = { ..._WithMemoryCache.trieCache[key], data: p };
+        caches.push(p.then());
       }
     }
-    return Promise.all([]);
+    return Promise.all(caches);
   }
 };
 var WithMemoryCache = _WithMemoryCache;
@@ -456,7 +504,7 @@ var PathTrie = class {
       }
       return result;
     };
-    const scanWildcards = () => {
+    const scanWildcards = (i) => {
       let wildcard = void 0;
       while ((!wildcard || wildcard.active) && wildcards.length) {
         wildcard = wildcards.pop();
@@ -466,6 +514,11 @@ var PathTrie = class {
       wildcard.active = true;
       cur = wildcard == null ? void 0 : wildcard.startTrie;
       wildcards.push(wildcard);
+      if (i === segments.length - 1 && wildcards.length && wildcards[wildcards.length - 1].active && wildcards[wildcards.length - 1].startTrie[dataProp]) {
+        wildcards[wildcards.length - 1].startTrie[dataProp].forEach(
+          (d) => ret.push({ data: d, variables: getVariables() })
+        );
+      }
       return wildcard == null ? void 0 : wildcard.start;
     };
     for (let i = 0; i < segments.length; i++) {
@@ -494,21 +547,22 @@ var PathTrie = class {
         if (i === segments.length - 1) {
           if (cur[dataProp]) {
             cur[dataProp].forEach((d) => ret.push({ data: d, variables: getVariables() }));
+          } else {
+            const more = scanWildcards(i);
+            if (typeof more === "undefined" || ret.length > 0 && bestMatch)
+              return [...ret, ...splats];
+            i = more;
           }
         }
-      } else if (i === segments.length - 1) {
-        const more = scanWildcards();
-        if (typeof more === "undefined")
+      } else {
+        const more = scanWildcards(i);
+        if (typeof more === "undefined" || ret.length > 0 && bestMatch)
           return [...ret, ...splats];
         i = more;
-        if (i === segments.length - 1 && wildcards.length && wildcards[wildcards.length - 1].active && wildcards[wildcards.length - 1].startTrie[dataProp]) {
-          wildcards[wildcards.length - 1].startTrie[dataProp].forEach(
-            (d) => ret.push({ data: d, variables: getVariables() })
-          );
-        }
-      } else {
-        const more = scanWildcards();
-        if (typeof more === "undefined")
+      }
+      if (i === segments.length - 1 && wildcards.length !== 0) {
+        const more = scanWildcards(i);
+        if (typeof more === "undefined" || ret.length > 0 && bestMatch)
           return [...ret, ...splats];
         i = more;
       }
@@ -668,22 +722,29 @@ var _RedirectClient = class extends import_api.ApiClient {
     }
   }
   async assembleTrie() {
-    const trie = new PathTrie();
-    for await (const redirect of this.getAllRedirects()) {
-      const source = processUrl(redirect.redirect.sourceUrl);
-      const target = processUrl(redirect.redirect.targetUrl);
-      trie.insert(source.path, {
-        redirect: redirect.redirect,
-        metadata: redirect.metadata,
-        reverse: false
-      });
-      trie.insert(target.path, {
-        redirect: redirect.redirect,
-        metadata: redirect.metadata,
-        reverse: true
-      });
+    if (!_RedirectClient.assembling) {
+      _RedirectClient.assembling = true;
+      _RedirectClient.assemblingPromise = (async () => {
+        const trie = new PathTrie();
+        for await (const redirect of this.getAllRedirects()) {
+          const source = processUrl(redirect.redirect.sourceUrl);
+          const target = processUrl(redirect.redirect.targetUrl);
+          trie.insert(source.path, {
+            redirect: redirect.redirect,
+            metadata: redirect.metadata,
+            reverse: false
+          });
+          trie.insert(target.path, {
+            redirect: redirect.redirect,
+            metadata: redirect.metadata,
+            reverse: true
+          });
+        }
+        _RedirectClient.assembling = false;
+        return trie;
+      })();
     }
-    return trie;
+    return await _RedirectClient.assemblingPromise;
   }
   static processHops(url, trie, bestMatch, options) {
     var _a;
@@ -755,20 +816,14 @@ var _RedirectClient = class extends import_api.ApiClient {
    * @param options - Different options available to the redirect engine
    */
   static processDefinitionToResults(processedUrl, definition, variables, options) {
-    var _a, _b, _c, _d, _e;
     const resultUrl = (options == null ? void 0 : options.reverse) ? definition.redirect.sourceUrl : definition.redirect.targetUrl;
     const processedResult = processUrl(resultUrl);
     const redirect = definition == null ? void 0 : definition.redirect;
     if (redirect.sourceMustMatchDomain && processedUrl.domain !== processedResult.domain)
       return void 0;
-    const protocol = redirect.targetPreserveIncomingProtocol ? processedUrl.protocol : (_b = (_a = processedResult.protocol) != null ? _a : processedUrl.protocol) != null ? _b : "";
-    const domain = redirect.targetPreserveIncomingDomain ? processedUrl.domain : (_d = (_c = processedResult.domain) != null ? _c : processedUrl.domain) != null ? _d : "";
-    const queryString = redirect.sourceRetainQuerystring && processedResult.query ? (_e = processedResult.query) != null ? _e : "" : definition.redirect.sourceRetainQuerystring ? processedUrl.query : "";
-    const finalUrl = `${protocol}${domain}${processedResult.port}${processedResult.path}${queryString}`;
+    const finalUrl = _RedirectClient.getTargetVariableExpandedUrl(processedUrl.url, redirect);
     return {
-      url: variables.reduce((cur, o) => {
-        return cur.replace(o.key, o.value);
-      }, finalUrl),
+      url: finalUrl,
       definition,
       label: (options == null ? void 0 : options.label) ? variables.reduce((cur, o) => {
         return cur.replace(o.key, `<em>${o.value}</em>`);
@@ -803,7 +858,7 @@ var _RedirectClient = class extends import_api.ApiClient {
     }
     const protocol = redirectDefinition.targetPreserveIncomingProtocol ? processedUrl.protocol : processedTarget.protocol;
     const domain = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.domain : processedTarget.domain;
-    const port = processedTarget.port;
+    const port = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.port : processedTarget.port;
     const query = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.query, processedTarget.query) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.query : processedTarget.query;
     const fragment = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.fragment, processedTarget.fragment) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.fragment : processedTarget.fragment;
     return `${protocol}${domain}${port}${finalUrlPath}${query}${fragment}`;
@@ -825,15 +880,15 @@ var _RedirectClient = class extends import_api.ApiClient {
       return (fragment ? "#" : "?") + merged;
     return "";
   }
-  static getSourceVariables(path, source, isVariable = (pathSegment) => pathSegment.startsWith(":")) {
+  static getSourceVariables(path, source, isVariable = (pathSegment, isLast) => pathSegment.startsWith(":") || pathSegment === "*" && isLast) {
     const variables = {};
     const pathSegments = path.split("/");
     const sourceSegments = source.split("/");
-    if (pathSegments.length !== sourceSegments.length) {
+    if (pathSegments.length !== sourceSegments.length && !source.endsWith("/*")) {
       throw new Error("Path and source have different numbers of path segments, must be the same");
     }
     sourceSegments.forEach((sourceSegment, i) => {
-      if (isVariable(sourceSegment)) {
+      if (isVariable(sourceSegment, i === sourceSegments.length - 1)) {
         variables[sourceSegment] = pathSegments[i];
       }
     });
@@ -845,6 +900,10 @@ RedirectClient.processUrlBestMatch = async (url, trie, options) => {
   var _a;
   return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
 };
+RedirectClient.assembling = false;
+RedirectClient.assemblingPromise = new Promise(
+  () => new PathTrie()
+);
 var UncachedRedirectClient = class extends RedirectClient {
   constructor(options) {
     super({ ...options, bypassCache: true });

package/dist/index.mjs

@@ -1,5 +1,43 @@
 import "./chunk-FFYIGW52.mjs";
 
+// src/cache/data/refresher.ts
+var Refresher = class {
+  /**
+   * Create new refresher
+   * @param refreshRate - How often the refresher will refresh. Cannot be less than 20000 ms or 20 seconds
+   * @param refreshDuration - How many times it should refresh before sleeps until something accesses the cache. Cannot be more than 5
+   * @param refresh - Refresh method to run at the refresh rate intervals
+   */
+  constructor({ refreshRate, refreshDuration, refresh }) {
+    this.refreshCounter = 0;
+    this.finalRate = refreshRate >= 2e4 ? refreshRate : 2e4;
+    this.finalDuration = refreshDuration <= 5 ? refreshDuration : 5;
+    this.refreshCounter = 1;
+    this.refresh = refresh;
+    this.start();
+  }
+  /**
+   * Start async updating process again, will run for the same duration as the original.  refreshRate * refreshDuration milliseconds
+   */
+  kick() {
+    if (this.refreshCounter === 0) {
+      this.start();
+    }
+    this.refreshCounter = 1;
+  }
+  start() {
+    this.interval = setTimeout(async () => {
+      if (this.refreshCounter > this.finalDuration) {
+        this.refreshCounter = 0;
+      } else {
+        await this.refresh();
+        this.refreshCounter++;
+        this.start();
+      }
+    }, this.finalRate);
+  }
+};
+
 // src/cache/redirectClientCache.ts
 var RedirectClientCache = class {
   constructor(options) {
@@ -11,11 +49,19 @@ var RedirectClientCache = class {
 var _WithMemoryCache = class extends RedirectClientCache {
   constructor(options) {
     super(options);
+    if (options.refreshRate && !_WithMemoryCache.refresher) {
+      _WithMemoryCache.refresher = new Refresher({
+        refreshRate: options.refreshRate,
+        refreshDuration: 5,
+        refresh: this.refresh
+      });
+    }
   }
   /* Get data from the cache and debounce pausing refresh */
   get(key) {
-    var _a, _b;
-    return (_b = (_a = _WithMemoryCache.trieCache[key]) == null ? void 0 : _a.data) != null ? _b : void 0;
+    var _a, _b, _c;
+    (_a = _WithMemoryCache.refresher) == null ? void 0 : _a.kick();
+    return (_c = (_b = _WithMemoryCache.trieCache[key]) == null ? void 0 : _b.data) != null ? _c : void 0;
   }
   /* Set new data to the cache and reset the refresh method */
   set(key, data, refresh) {
@@ -39,13 +85,15 @@ var _WithMemoryCache = class extends RedirectClientCache {
   }
   refresh() {
     var _a, _b;
+    const caches = [];
     for (const key in _WithMemoryCache.trieCache) {
       const p = (_b = (_a = _WithMemoryCache.trieCache[key]) == null ? void 0 : _a.refresh) == null ? void 0 : _b.call(_a);
       if (p) {
         _WithMemoryCache.trieCache[key] = { ..._WithMemoryCache.trieCache[key], data: p };
+        caches.push(p.then());
       }
     }
-    return Promise.all([]);
+    return Promise.all(caches);
   }
 };
 var WithMemoryCache = _WithMemoryCache;
@@ -130,7 +178,7 @@ var PathTrie = class {
       }
       return result;
     };
-    const scanWildcards = () => {
+    const scanWildcards = (i) => {
       let wildcard = void 0;
       while ((!wildcard || wildcard.active) && wildcards.length) {
         wildcard = wildcards.pop();
@@ -140,6 +188,11 @@ var PathTrie = class {
       wildcard.active = true;
       cur = wildcard == null ? void 0 : wildcard.startTrie;
       wildcards.push(wildcard);
+      if (i === segments.length - 1 && wildcards.length && wildcards[wildcards.length - 1].active && wildcards[wildcards.length - 1].startTrie[dataProp]) {
+        wildcards[wildcards.length - 1].startTrie[dataProp].forEach(
+          (d) => ret.push({ data: d, variables: getVariables() })
+        );
+      }
       return wildcard == null ? void 0 : wildcard.start;
     };
     for (let i = 0; i < segments.length; i++) {
@@ -168,21 +221,22 @@ var PathTrie = class {
         if (i === segments.length - 1) {
           if (cur[dataProp]) {
             cur[dataProp].forEach((d) => ret.push({ data: d, variables: getVariables() }));
+          } else {
+            const more = scanWildcards(i);
+            if (typeof more === "undefined" || ret.length > 0 && bestMatch)
+              return [...ret, ...splats];
+            i = more;
           }
         }
-      } else if (i === segments.length - 1) {
-        const more = scanWildcards();
-        if (typeof more === "undefined")
+      } else {
+        const more = scanWildcards(i);
+        if (typeof more === "undefined" || ret.length > 0 && bestMatch)
           return [...ret, ...splats];
         i = more;
-        if (i === segments.length - 1 && wildcards.length && wildcards[wildcards.length - 1].active && wildcards[wildcards.length - 1].startTrie[dataProp]) {
-          wildcards[wildcards.length - 1].startTrie[dataProp].forEach(
-            (d) => ret.push({ data: d, variables: getVariables() })
-          );
-        }
-      } else {
-        const more = scanWildcards();
-        if (typeof more === "undefined")
+      }
+      if (i === segments.length - 1 && wildcards.length !== 0) {
+        const more = scanWildcards(i);
+        if (typeof more === "undefined" || ret.length > 0 && bestMatch)
           return [...ret, ...splats];
         i = more;
       }
@@ -342,22 +396,29 @@ var _RedirectClient = class extends ApiClient {
     }
   }
   async assembleTrie() {
-    const trie = new PathTrie();
-    for await (const redirect of this.getAllRedirects()) {
-      const source = processUrl(redirect.redirect.sourceUrl);
-      const target = processUrl(redirect.redirect.targetUrl);
-      trie.insert(source.path, {
-        redirect: redirect.redirect,
-        metadata: redirect.metadata,
-        reverse: false
-      });
-      trie.insert(target.path, {
-        redirect: redirect.redirect,
-        metadata: redirect.metadata,
-        reverse: true
-      });
+    if (!_RedirectClient.assembling) {
+      _RedirectClient.assembling = true;
+      _RedirectClient.assemblingPromise = (async () => {
+        const trie = new PathTrie();
+        for await (const redirect of this.getAllRedirects()) {
+          const source = processUrl(redirect.redirect.sourceUrl);
+          const target = processUrl(redirect.redirect.targetUrl);
+          trie.insert(source.path, {
+            redirect: redirect.redirect,
+            metadata: redirect.metadata,
+            reverse: false
+          });
+          trie.insert(target.path, {
+            redirect: redirect.redirect,
+            metadata: redirect.metadata,
+            reverse: true
+          });
+        }
+        _RedirectClient.assembling = false;
+        return trie;
+      })();
     }
-    return trie;
+    return await _RedirectClient.assemblingPromise;
   }
   static processHops(url, trie, bestMatch, options) {
     var _a;
@@ -429,20 +490,14 @@ var _RedirectClient = class extends ApiClient {
    * @param options - Different options available to the redirect engine
    */
   static processDefinitionToResults(processedUrl, definition, variables, options) {
-    var _a, _b, _c, _d, _e;
     const resultUrl = (options == null ? void 0 : options.reverse) ? definition.redirect.sourceUrl : definition.redirect.targetUrl;
     const processedResult = processUrl(resultUrl);
     const redirect = definition == null ? void 0 : definition.redirect;
     if (redirect.sourceMustMatchDomain && processedUrl.domain !== processedResult.domain)
       return void 0;
-    const protocol = redirect.targetPreserveIncomingProtocol ? processedUrl.protocol : (_b = (_a = processedResult.protocol) != null ? _a : processedUrl.protocol) != null ? _b : "";
-    const domain = redirect.targetPreserveIncomingDomain ? processedUrl.domain : (_d = (_c = processedResult.domain) != null ? _c : processedUrl.domain) != null ? _d : "";
-    const queryString = redirect.sourceRetainQuerystring && processedResult.query ? (_e = processedResult.query) != null ? _e : "" : definition.redirect.sourceRetainQuerystring ? processedUrl.query : "";
-    const finalUrl = `${protocol}${domain}${processedResult.port}${processedResult.path}${queryString}`;
+    const finalUrl = _RedirectClient.getTargetVariableExpandedUrl(processedUrl.url, redirect);
     return {
-      url: variables.reduce((cur, o) => {
-        return cur.replace(o.key, o.value);
-      }, finalUrl),
+      url: finalUrl,
       definition,
       label: (options == null ? void 0 : options.label) ? variables.reduce((cur, o) => {
         return cur.replace(o.key, `<em>${o.value}</em>`);
@@ -477,7 +532,7 @@ var _RedirectClient = class extends ApiClient {
     }
     const protocol = redirectDefinition.targetPreserveIncomingProtocol ? processedUrl.protocol : processedTarget.protocol;
     const domain = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.domain : processedTarget.domain;
-    const port = processedTarget.port;
+    const port = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.port : processedTarget.port;
     const query = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.query, processedTarget.query) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.query : processedTarget.query;
     const fragment = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.fragment, processedTarget.fragment) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.fragment : processedTarget.fragment;
     return `${protocol}${domain}${port}${finalUrlPath}${query}${fragment}`;
@@ -499,15 +554,15 @@ var _RedirectClient = class extends ApiClient {
       return (fragment ? "#" : "?") + merged;
     return "";
   }
-  static getSourceVariables(path, source, isVariable = (pathSegment) => pathSegment.startsWith(":")) {
+  static getSourceVariables(path, source, isVariable = (pathSegment, isLast) => pathSegment.startsWith(":") || pathSegment === "*" && isLast) {
     const variables = {};
     const pathSegments = path.split("/");
     const sourceSegments = source.split("/");
-    if (pathSegments.length !== sourceSegments.length) {
+    if (pathSegments.length !== sourceSegments.length && !source.endsWith("/*")) {
       throw new Error("Path and source have different numbers of path segments, must be the same");
     }
     sourceSegments.forEach((sourceSegment, i) => {
-      if (isVariable(sourceSegment)) {
+      if (isVariable(sourceSegment, i === sourceSegments.length - 1)) {
         variables[sourceSegment] = pathSegments[i];
       }
     });
@@ -519,6 +574,10 @@ RedirectClient.processUrlBestMatch = async (url, trie, options) => {
   var _a;
   return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
 };
+RedirectClient.assembling = false;
+RedirectClient.assemblingPromise = new Promise(
+  () => new PathTrie()
+);
 var UncachedRedirectClient = class extends RedirectClient {
   constructor(options) {
     super({ ...options, bypassCache: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/redirect",
-  "version": "19.27.0",
+  "version": "19.29.0",
   "description": "Uniform redirect client",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -32,12 +32,12 @@
     "/dist"
   ],
   "dependencies": {
-    "@uniformdev/context": "19.27.0",
+    "@uniformdev/context": "19.29.0",
     "p-limit": "^3.1.0",
     "rfdc": "^1.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8041631f93aca51a236597c1aea606c6dc8732e8"
+  "gitHead": "f8e9d5f6283fb3d72ba095c0e307907dc591ce4a"
 }