@uniformdev/redirect 19.15.0 → 19.19.0

package/dist/index.d.ts

@@ -64,6 +64,31 @@ declare class RedirectClient extends ApiClient<RedirectClientOptions> {
     constructor(options: RedirectClientOptions);
     getRedirect: (options: RedirectClientGetRedirect) => Promise<RedirectDefinition | undefined>;
     getRedirects: (options?: RedirectClientGetRedirects) => Promise<RedirectGetResponse>;
+    getAllRedirects(orderBy?: RedirectClientGetRedirects['orderBy']): AsyncGenerator<{
+        redirect: {
+            id?: string | undefined;
+            sourceUrl: string;
+            targetUrl: string;
+            targetStatusCode: number;
+            sourceProjectMapNodeId?: string | undefined;
+            targetProjectMapNodeId?: string | undefined;
+            projectMapId?: string | undefined;
+            sourceRetainQuerystring?: boolean | undefined;
+            sourceMustMatchDomain?: boolean | undefined;
+            targetPreserveIncomingProtocol?: boolean | undefined;
+            targetPreserveIncomingDomain?: boolean | undefined;
+            stopExecutingAfter?: boolean | undefined;
+            targetMergeQuerystring?: boolean | undefined;
+            labelAsSystem?: boolean | undefined;
+        };
+        metadata: {
+            updatedAt?: string | undefined;
+            updatedBy?: string | undefined;
+            createdAt?: string | undefined;
+            createdBy?: string | undefined;
+        };
+        total: number | undefined;
+    }, void, unknown>;
     getRedirectTrie: (options?: {
         reverse?: boolean;
         bypassDataCache?: boolean;
@@ -85,10 +110,10 @@ declare class RedirectClient extends ApiClient<RedirectClientOptions> {
      * @param options - Different options available to the redirect engine
      */
     private static processDefinitionToResults;
+    static validateRedirect(url: string, redirectDefinition: RedirectDefinition['redirect']): boolean;
     static getTargetVariableExpandedUrl(url: string, redirectDefinition: RedirectDefinition['redirect'], isVariable?: (pathSegment: string) => boolean): string;
     private static mergeQueryStrings;
     private static getSourceVariables;
-    private static processUrl;
 }
 declare class UncachedRedirectClient extends RedirectClient {
     constructor(options: Omit<RedirectClientOptions, 'bypassCache'>);
@@ -392,4 +417,29 @@ type RedirectFileConverterParams<T> = {
 declare function ExtractWildcards(url: string): Wildcard[];
 declare function RedirectFileConverter<T>({ client, redirectEntryObject, wildcardConverter, writeFile, }: RedirectFileConverterParams<T>): Promise<void>;
 
-export { ExtractWildcards, PathTrie, PathTrieData, RedirectClient, RedirectClientGetRedirect, RedirectClientGetRedirects, RedirectClientGetRequest, RedirectClientOptions, RedirectDataCache, RedirectDefinition, RedirectDefinitions, RedirectDeleteRequest, RedirectDeleteResponse, RedirectFileConverter, RedirectFileConverterParams, RedirectGetRequest, RedirectGetResponse, RedirectOptions, RedirectResult, RedirectUpsertRequest, RedirectUpsertResponse, SourceAndTarget, SourceTargetAndWildcards, UncachedRedirectClient, Wildcard, WithMemoryCache, pathTrieReturn };
+/**
+ * @typedef {Object} ProcessedUrl
+ * @property {string} url - The full url used during processing
+ * @property {string} path - The path portion of the URL
+ * @property {string} domain - The domain of the URL
+ * @property {string} port - The port of the URL
+ * @property {string} query - The querystring of the URL
+ * @property {string} fragment - The fragment of the URL
+ * @property {string} protocol - The protocol of the URL
+ */
+type ProcessedUrl = {
+    url: string;
+    path: string;
+    domain: string;
+    port: string;
+    query: string;
+    fragment: string;
+    protocol: string;
+};
+/**
+ * Breaks a url into the separate parts for processing
+ * @returns {ProcessedUrl} The url broken down into independent components
+ */
+declare function processUrl(url: string): ProcessedUrl;
+
+export { ExtractWildcards, PathTrie, PathTrieData, ProcessedUrl, RedirectClient, RedirectClientGetRedirect, RedirectClientGetRedirects, RedirectClientGetRequest, RedirectClientOptions, RedirectDataCache, RedirectDefinition, RedirectDefinitions, RedirectDeleteRequest, RedirectDeleteResponse, RedirectFileConverter, RedirectFileConverterParams, RedirectGetRequest, RedirectGetResponse, RedirectOptions, RedirectResult, RedirectUpsertRequest, RedirectUpsertResponse, SourceAndTarget, SourceTargetAndWildcards, UncachedRedirectClient, Wildcard, WithMemoryCache, pathTrieReturn, processUrl };

package/dist/index.esm.js

@@ -197,6 +197,23 @@ var PathTrieData = class {
 
 // src/redirectClient.ts
 import { ApiClient } from "@uniformdev/context/api";
+
+// src/util/url.ts
+function processUrl(url) {
+  var _a, _b, _c, _d, _e, _f;
+  const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
+  return {
+    url,
+    protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
+    domain: (_b = matches == null ? void 0 : matches[3]) != null ? _b : "",
+    port: (_c = matches == null ? void 0 : matches[4]) != null ? _c : "",
+    path: (_d = matches == null ? void 0 : matches[5]) != null ? _d : "",
+    query: (_e = matches == null ? void 0 : matches[6]) != null ? _e : "",
+    fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
+  };
+}
+
+// src/redirectClient.ts
 var _RedirectClient = class extends ApiClient {
   constructor(options) {
     super(options);
@@ -223,8 +240,8 @@ var _RedirectClient = class extends ApiClient {
         if (result)
           return result;
       }
-      const ret = this.assembleTrie(projectId, options);
-      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie(projectId, options));
+      const ret = this.assembleTrie(projectId);
+      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie(projectId));
       return ret;
     };
     this.resetRedirectTrieDataCache = async () => {
@@ -302,25 +319,37 @@ var _RedirectClient = class extends ApiClient {
       }
     }
   }
-  async assembleTrie(projectId, options) {
-    var _a;
-    const trie = new PathTrie();
-    let offset = 0;
-    let total = 0;
-    do {
+  async *getAllRedirects(orderBy = "updated_at desc") {
+    var _a, _b;
+    const { projectId } = this.options;
+    let requestCount = 0;
+    let results = void 0;
+    while (requestCount === 0 || ((_a = results == null ? void 0 : results.redirects) == null ? void 0 : _a.length)) {
       const fetchUri = this.createUrl("/api/v1/redirect", {
-        projectId,
         limit: 50,
-        offset
+        offset: requestCount * 50,
+        orderBy,
+        projectId
       });
-      const redirects = await this.apiClient(fetchUri);
-      trie.insertMany(
-        redirects.redirects,
-        (r) => (options == null ? void 0 : options.reverse) ? r.redirect.targetUrl : r.redirect.sourceUrl
-      );
-      total = (_a = redirects.total) != null ? _a : 0;
-      offset += 50;
-    } while (offset < total);
+      results = await this.apiClient(fetchUri);
+      const redirectCount = results.redirects.length;
+      for (let i = 0; i < redirectCount; i++) {
+        yield { total: results.total, ...results.redirects[i] };
+      }
+      requestCount++;
+      if (requestCount * 50 > ((_b = results.total) != null ? _b : 0)) {
+        break;
+      }
+    }
+  }
+  async assembleTrie(projectId, options) {
+    const trie = new PathTrie();
+    for await (const redirect of this.getAllRedirects()) {
+      const path = processUrl(
+        (options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl
+      ).path;
+      trie.insert(path, redirect);
+    }
     return trie;
   }
   static processHops(url, trie, bestMatch, options) {
@@ -368,7 +397,7 @@ var _RedirectClient = class extends ApiClient {
     return ret;
   }
   static processHop(url, trie, bestMatch, options) {
-    const processedUrl = this.processUrl(url);
+    const processedUrl = processUrl(url);
     let definition = trie.find(url, false);
     if (!(definition == null ? void 0 : definition.length)) {
       definition = trie.find(processedUrl.path + processedUrl.query, bestMatch);
@@ -377,7 +406,7 @@ var _RedirectClient = class extends ApiClient {
       definition = trie.find(processedUrl.path, bestMatch);
     }
     if (definition == null ? void 0 : definition.length) {
-      return definition.map(
+      return definition.filter((def) => _RedirectClient.validateRedirect(url, def.data.redirect)).map(
         (def) => this.processDefinitionToResults(processedUrl, def.data, def.variables, options)
       ).filter((r) => Boolean(r));
     }
@@ -393,7 +422,7 @@ var _RedirectClient = class extends ApiClient {
   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 = this.processUrl(resultUrl);
+    const processedResult = processUrl(resultUrl);
     const redirect = definition == null ? void 0 : definition.redirect;
     if (redirect.sourceMustMatchDomain && processedUrl.domain !== processedResult.domain)
       return void 0;
@@ -411,11 +440,28 @@ var _RedirectClient = class extends ApiClient {
       }, finalUrl) : void 0
     };
   }
+  static validateRedirect(url, redirectDefinition) {
+    const processedSource = processUrl(redirectDefinition.sourceUrl);
+    const processedUrl = processUrl(url);
+    if (redirectDefinition.sourceMustMatchDomain && processedSource.domain !== processedUrl.domain)
+      return false;
+    if (processedSource.query && !processedUrl.query)
+      return false;
+    if (processedSource.query && processedUrl.query) {
+      const sourceqs = new URLSearchParams(processedSource.query);
+      const urlqs = new URLSearchParams(processedUrl.query);
+      for (const [key] of sourceqs) {
+        if (!urlqs.has(key) || urlqs.get(key) !== sourceqs.get(key))
+          return false;
+      }
+    }
+    return true;
+  }
   static getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
-    const processedTarget = this.processUrl(redirectDefinition.targetUrl);
-    const processedSource = this.processUrl(redirectDefinition.sourceUrl);
+    const processedTarget = processUrl(redirectDefinition.targetUrl);
+    const processedSource = processUrl(redirectDefinition.sourceUrl);
     let finalUrlPath = processedTarget.path;
-    const processedUrl = this.processUrl(url);
+    const processedUrl = processUrl(url);
     const variables = this.getSourceVariables(processedUrl.path, processedSource.path, isVariable);
     for (const variable in variables) {
       finalUrlPath = finalUrlPath.replace(variable, variables[variable]);
@@ -458,19 +504,6 @@ var _RedirectClient = class extends ApiClient {
     });
     return variables;
   }
-  static processUrl(url) {
-    var _a, _b, _c, _d, _e, _f;
-    const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
-    return {
-      url,
-      protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
-      domain: (_b = matches == null ? void 0 : matches[3]) != null ? _b : "",
-      port: (_c = matches == null ? void 0 : matches[4]) != null ? _c : "",
-      path: (_d = matches == null ? void 0 : matches[5]) != null ? _d : "",
-      query: (_e = matches == null ? void 0 : matches[6]) != null ? _e : "",
-      fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
-    };
-  }
 };
 var RedirectClient = _RedirectClient;
 RedirectClient.processUrlBestMatch = async (url, trie, options) => {
@@ -485,7 +518,7 @@ var UncachedRedirectClient = class extends RedirectClient {
 
 // src/util/RedirectFileConverter.ts
 var getDefaultClient = async () => {
-  const dotenv = await import("./main-NHOL4NFR.mjs");
+  const dotenv = await import("./main-DHQ5ANFI.mjs");
   dotenv.config();
   return new RedirectClient({
     apiKey: process.env.UNIFORM_API_KEY,
@@ -562,5 +595,6 @@ export {
   RedirectClient,
   RedirectFileConverter,
   UncachedRedirectClient,
-  WithMemoryCache
+  WithMemoryCache,
+  processUrl
 };

package/dist/index.js

@@ -30,19 +30,19 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../node_modules/.pnpm/dotenv@16.0.3/node_modules/dotenv/package.json
+// ../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/package.json
 var require_package = __commonJS({
-  "../../node_modules/.pnpm/dotenv@16.0.3/node_modules/dotenv/package.json"(exports, module2) {
+  "../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/package.json"(exports, module2) {
     module2.exports = {
       name: "dotenv",
-      version: "16.0.3",
+      version: "16.1.3",
       description: "Loads environment variables from .env file",
       main: "lib/main.js",
       types: "lib/main.d.ts",
       exports: {
         ".": {
-          require: "./lib/main.js",
           types: "./lib/main.d.ts",
+          require: "./lib/main.js",
           default: "./lib/main.js"
         },
         "./config": "./config.js",
@@ -66,6 +66,7 @@ var require_package = __commonJS({
         type: "git",
         url: "git://github.com/motdotla/dotenv.git"
       },
+      funding: "https://github.com/motdotla/dotenv?sponsor=1",
       keywords: [
         "dotenv",
         "env",
@@ -78,30 +79,34 @@ var require_package = __commonJS({
       readmeFilename: "README.md",
       license: "BSD-2-Clause",
       devDependencies: {
-        "@types/node": "^17.0.9",
+        "@definitelytyped/dtslint": "^0.0.133",
+        "@types/node": "^18.11.3",
         decache: "^4.6.1",
-        dtslint: "^3.7.0",
-        sinon: "^12.0.1",
-        standard: "^16.0.4",
+        sinon: "^14.0.1",
+        standard: "^17.0.0",
         "standard-markdown": "^7.1.0",
-        "standard-version": "^9.3.2",
-        tap: "^15.1.6",
+        "standard-version": "^9.5.0",
+        tap: "^16.3.0",
         tar: "^6.1.11",
-        typescript: "^4.5.4"
+        typescript: "^4.8.4"
       },
       engines: {
         node: ">=12"
+      },
+      browser: {
+        fs: false
       }
     };
   }
 });
 
-// ../../node_modules/.pnpm/dotenv@16.0.3/node_modules/dotenv/lib/main.js
+// ../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/lib/main.js
 var require_main = __commonJS({
-  "../../node_modules/.pnpm/dotenv@16.0.3/node_modules/dotenv/lib/main.js"(exports, module2) {
+  "../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/lib/main.js"(exports, module2) {
     var fs = require("fs");
     var path = require("path");
     var os = require("os");
+    var crypto = require("crypto");
     var packageJson = require_package();
     var version = packageJson.version;
     var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
@@ -124,17 +129,89 @@ var require_main = __commonJS({
       }
       return obj;
     }
+    function _parseVault(options) {
+      const vaultPath = _vaultPath(options);
+      const result = DotenvModule.configDotenv({ path: vaultPath });
+      if (!result.parsed) {
+        throw new Error(`MISSING_DATA: Cannot parse ${vaultPath} for an unknown reason`);
+      }
+      const keys = _dotenvKey().split(",");
+      const length = keys.length;
+      let decrypted;
+      for (let i = 0; i < length; i++) {
+        try {
+          const key = keys[i].trim();
+          const attrs = _instructions(result, key);
+          decrypted = DotenvModule.decrypt(attrs.ciphertext, attrs.key);
+          break;
+        } catch (error) {
+          if (i + 1 >= length) {
+            throw error;
+          }
+        }
+      }
+      return DotenvModule.parse(decrypted);
+    }
     function _log(message) {
+      console.log(`[dotenv@${version}][INFO] ${message}`);
+    }
+    function _warn(message) {
+      console.log(`[dotenv@${version}][WARN] ${message}`);
+    }
+    function _debug(message) {
       console.log(`[dotenv@${version}][DEBUG] ${message}`);
     }
+    function _dotenvKey() {
+      if (process.env.DOTENV_KEY && process.env.DOTENV_KEY.length > 0) {
+        return process.env.DOTENV_KEY;
+      }
+      return "";
+    }
+    function _instructions(result, dotenvKey) {
+      let uri;
+      try {
+        uri = new URL(dotenvKey);
+      } catch (error) {
+        if (error.code === "ERR_INVALID_URL") {
+          throw new Error("INVALID_DOTENV_KEY: Wrong format. Must be in valid uri format like dotenv://:key_1234@dotenv.org/vault/.env.vault?environment=development");
+        }
+        throw error;
+      }
+      const key = uri.password;
+      if (!key) {
+        throw new Error("INVALID_DOTENV_KEY: Missing key part");
+      }
+      const environment = uri.searchParams.get("environment");
+      if (!environment) {
+        throw new Error("INVALID_DOTENV_KEY: Missing environment part");
+      }
+      const environmentKey = `DOTENV_VAULT_${environment.toUpperCase()}`;
+      const ciphertext = result.parsed[environmentKey];
+      if (!ciphertext) {
+        throw new Error(`NOT_FOUND_DOTENV_ENVIRONMENT: Cannot locate environment ${environmentKey} in your .env.vault file.`);
+      }
+      return { ciphertext, key };
+    }
+    function _vaultPath(options) {
+      let dotenvPath = path.resolve(process.cwd(), ".env");
+      if (options && options.path && options.path.length > 0) {
+        dotenvPath = options.path;
+      }
+      return dotenvPath.endsWith(".vault") ? dotenvPath : `${dotenvPath}.vault`;
+    }
     function _resolveHome(envPath) {
       return envPath[0] === "~" ? path.join(os.homedir(), envPath.slice(1)) : envPath;
     }
-    function config(options) {
+    function _configVault(options) {
+      _log("Loading env from encrypted .env.vault");
+      const parsed = DotenvModule._parseVault(options);
+      DotenvModule.populate(process.env, parsed, options);
+      return { parsed };
+    }
+    function configDotenv(options) {
       let dotenvPath = path.resolve(process.cwd(), ".env");
       let encoding = "utf8";
       const debug = Boolean(options && options.debug);
-      const override = Boolean(options && options.override);
       if (options) {
         if (options.path != null) {
           dotenvPath = _resolveHome(options.path);
@@ -145,36 +222,92 @@ var require_main = __commonJS({
       }
       try {
         const parsed = DotenvModule.parse(fs.readFileSync(dotenvPath, { encoding }));
-        Object.keys(parsed).forEach(function(key) {
-          if (!Object.prototype.hasOwnProperty.call(process.env, key)) {
-            process.env[key] = parsed[key];
-          } else {
-            if (override === true) {
-              process.env[key] = parsed[key];
-            }
-            if (debug) {
-              if (override === true) {
-                _log(`"${key}" is already defined in \`process.env\` and WAS overwritten`);
-              } else {
-                _log(`"${key}" is already defined in \`process.env\` and was NOT overwritten`);
-              }
-            }
-          }
-        });
+        DotenvModule.populate(process.env, parsed, options);
         return { parsed };
       } catch (e) {
         if (debug) {
-          _log(`Failed to load ${dotenvPath} ${e.message}`);
+          _debug(`Failed to load ${dotenvPath} ${e.message}`);
         }
         return { error: e };
       }
     }
+    function config(options) {
+      const vaultPath = _vaultPath(options);
+      if (_dotenvKey().length === 0) {
+        return DotenvModule.configDotenv(options);
+      }
+      if (!fs.existsSync(vaultPath)) {
+        _warn(`You set DOTENV_KEY but you are missing a .env.vault file at ${vaultPath}. Did you forget to build it?`);
+        return DotenvModule.configDotenv(options);
+      }
+      return DotenvModule._configVault(options);
+    }
+    function decrypt(encrypted, keyStr) {
+      const key = Buffer.from(keyStr.slice(-64), "hex");
+      let ciphertext = Buffer.from(encrypted, "base64");
+      const nonce = ciphertext.slice(0, 12);
+      const authTag = ciphertext.slice(-16);
+      ciphertext = ciphertext.slice(12, -16);
+      try {
+        const aesgcm = crypto.createDecipheriv("aes-256-gcm", key, nonce);
+        aesgcm.setAuthTag(authTag);
+        return `${aesgcm.update(ciphertext)}${aesgcm.final()}`;
+      } catch (error) {
+        const isRange = error instanceof RangeError;
+        const invalidKeyLength = error.message === "Invalid key length";
+        const decryptionFailed = error.message === "Unsupported state or unable to authenticate data";
+        if (isRange || invalidKeyLength) {
+          const msg = "INVALID_DOTENV_KEY: It must be 64 characters long (or more)";
+          throw new Error(msg);
+        } else if (decryptionFailed) {
+          const msg = "DECRYPTION_FAILED: Please check your DOTENV_KEY";
+          throw new Error(msg);
+        } else {
+          console.error("Error: ", error.code);
+          console.error("Error: ", error.message);
+          throw error;
+        }
+      }
+    }
+    function populate(processEnv, parsed, options = {}) {
+      const debug = Boolean(options && options.debug);
+      const override = Boolean(options && options.override);
+      if (typeof parsed !== "object") {
+        throw new Error("OBJECT_REQUIRED: Please check the processEnv argument being passed to populate");
+      }
+      for (const key of Object.keys(parsed)) {
+        if (Object.prototype.hasOwnProperty.call(processEnv, key)) {
+          if (override === true) {
+            processEnv[key] = parsed[key];
+          }
+          if (debug) {
+            if (override === true) {
+              _debug(`"${key}" is already defined and WAS overwritten`);
+            } else {
+              _debug(`"${key}" is already defined and was NOT overwritten`);
+            }
+          }
+        } else {
+          processEnv[key] = parsed[key];
+        }
+      }
+    }
     var DotenvModule = {
+      configDotenv,
+      _configVault,
+      _parseVault,
       config,
-      parse
+      decrypt,
+      parse,
+      populate
     };
+    module2.exports.configDotenv = DotenvModule.configDotenv;
+    module2.exports._configVault = DotenvModule._configVault;
+    module2.exports._parseVault = DotenvModule._parseVault;
     module2.exports.config = DotenvModule.config;
+    module2.exports.decrypt = DotenvModule.decrypt;
     module2.exports.parse = DotenvModule.parse;
+    module2.exports.populate = DotenvModule.populate;
     module2.exports = DotenvModule;
   }
 });
@@ -188,7 +321,8 @@ __export(src_exports, {
   RedirectClient: () => RedirectClient,
   RedirectFileConverter: () => RedirectFileConverter,
   UncachedRedirectClient: () => UncachedRedirectClient,
-  WithMemoryCache: () => WithMemoryCache
+  WithMemoryCache: () => WithMemoryCache,
+  processUrl: () => processUrl
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -389,6 +523,23 @@ var PathTrieData = class {
 
 // src/redirectClient.ts
 var import_api = require("@uniformdev/context/api");
+
+// src/util/url.ts
+function processUrl(url) {
+  var _a, _b, _c, _d, _e, _f;
+  const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
+  return {
+    url,
+    protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
+    domain: (_b = matches == null ? void 0 : matches[3]) != null ? _b : "",
+    port: (_c = matches == null ? void 0 : matches[4]) != null ? _c : "",
+    path: (_d = matches == null ? void 0 : matches[5]) != null ? _d : "",
+    query: (_e = matches == null ? void 0 : matches[6]) != null ? _e : "",
+    fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
+  };
+}
+
+// src/redirectClient.ts
 var _RedirectClient = class extends import_api.ApiClient {
   constructor(options) {
     super(options);
@@ -415,8 +566,8 @@ var _RedirectClient = class extends import_api.ApiClient {
         if (result)
           return result;
       }
-      const ret = this.assembleTrie(projectId, options);
-      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie(projectId, options));
+      const ret = this.assembleTrie(projectId);
+      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie(projectId));
       return ret;
     };
     this.resetRedirectTrieDataCache = async () => {
@@ -494,25 +645,37 @@ var _RedirectClient = class extends import_api.ApiClient {
       }
     }
   }
-  async assembleTrie(projectId, options) {
-    var _a;
-    const trie = new PathTrie();
-    let offset = 0;
-    let total = 0;
-    do {
+  async *getAllRedirects(orderBy = "updated_at desc") {
+    var _a, _b;
+    const { projectId } = this.options;
+    let requestCount = 0;
+    let results = void 0;
+    while (requestCount === 0 || ((_a = results == null ? void 0 : results.redirects) == null ? void 0 : _a.length)) {
       const fetchUri = this.createUrl("/api/v1/redirect", {
-        projectId,
         limit: 50,
-        offset
+        offset: requestCount * 50,
+        orderBy,
+        projectId
       });
-      const redirects = await this.apiClient(fetchUri);
-      trie.insertMany(
-        redirects.redirects,
-        (r) => (options == null ? void 0 : options.reverse) ? r.redirect.targetUrl : r.redirect.sourceUrl
-      );
-      total = (_a = redirects.total) != null ? _a : 0;
-      offset += 50;
-    } while (offset < total);
+      results = await this.apiClient(fetchUri);
+      const redirectCount = results.redirects.length;
+      for (let i = 0; i < redirectCount; i++) {
+        yield { total: results.total, ...results.redirects[i] };
+      }
+      requestCount++;
+      if (requestCount * 50 > ((_b = results.total) != null ? _b : 0)) {
+        break;
+      }
+    }
+  }
+  async assembleTrie(projectId, options) {
+    const trie = new PathTrie();
+    for await (const redirect of this.getAllRedirects()) {
+      const path = processUrl(
+        (options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl
+      ).path;
+      trie.insert(path, redirect);
+    }
     return trie;
   }
   static processHops(url, trie, bestMatch, options) {
@@ -560,7 +723,7 @@ var _RedirectClient = class extends import_api.ApiClient {
     return ret;
   }
   static processHop(url, trie, bestMatch, options) {
-    const processedUrl = this.processUrl(url);
+    const processedUrl = processUrl(url);
     let definition = trie.find(url, false);
     if (!(definition == null ? void 0 : definition.length)) {
       definition = trie.find(processedUrl.path + processedUrl.query, bestMatch);
@@ -569,7 +732,7 @@ var _RedirectClient = class extends import_api.ApiClient {
       definition = trie.find(processedUrl.path, bestMatch);
     }
     if (definition == null ? void 0 : definition.length) {
-      return definition.map(
+      return definition.filter((def) => _RedirectClient.validateRedirect(url, def.data.redirect)).map(
         (def) => this.processDefinitionToResults(processedUrl, def.data, def.variables, options)
       ).filter((r) => Boolean(r));
     }
@@ -585,7 +748,7 @@ var _RedirectClient = class extends import_api.ApiClient {
   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 = this.processUrl(resultUrl);
+    const processedResult = processUrl(resultUrl);
     const redirect = definition == null ? void 0 : definition.redirect;
     if (redirect.sourceMustMatchDomain && processedUrl.domain !== processedResult.domain)
       return void 0;
@@ -603,11 +766,28 @@ var _RedirectClient = class extends import_api.ApiClient {
       }, finalUrl) : void 0
     };
   }
+  static validateRedirect(url, redirectDefinition) {
+    const processedSource = processUrl(redirectDefinition.sourceUrl);
+    const processedUrl = processUrl(url);
+    if (redirectDefinition.sourceMustMatchDomain && processedSource.domain !== processedUrl.domain)
+      return false;
+    if (processedSource.query && !processedUrl.query)
+      return false;
+    if (processedSource.query && processedUrl.query) {
+      const sourceqs = new URLSearchParams(processedSource.query);
+      const urlqs = new URLSearchParams(processedUrl.query);
+      for (const [key] of sourceqs) {
+        if (!urlqs.has(key) || urlqs.get(key) !== sourceqs.get(key))
+          return false;
+      }
+    }
+    return true;
+  }
   static getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
-    const processedTarget = this.processUrl(redirectDefinition.targetUrl);
-    const processedSource = this.processUrl(redirectDefinition.sourceUrl);
+    const processedTarget = processUrl(redirectDefinition.targetUrl);
+    const processedSource = processUrl(redirectDefinition.sourceUrl);
     let finalUrlPath = processedTarget.path;
-    const processedUrl = this.processUrl(url);
+    const processedUrl = processUrl(url);
     const variables = this.getSourceVariables(processedUrl.path, processedSource.path, isVariable);
     for (const variable in variables) {
       finalUrlPath = finalUrlPath.replace(variable, variables[variable]);
@@ -650,19 +830,6 @@ var _RedirectClient = class extends import_api.ApiClient {
     });
     return variables;
   }
-  static processUrl(url) {
-    var _a, _b, _c, _d, _e, _f;
-    const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
-    return {
-      url,
-      protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
-      domain: (_b = matches == null ? void 0 : matches[3]) != null ? _b : "",
-      port: (_c = matches == null ? void 0 : matches[4]) != null ? _c : "",
-      path: (_d = matches == null ? void 0 : matches[5]) != null ? _d : "",
-      query: (_e = matches == null ? void 0 : matches[6]) != null ? _e : "",
-      fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
-    };
-  }
 };
 var RedirectClient = _RedirectClient;
 RedirectClient.processUrlBestMatch = async (url, trie, options) => {
@@ -755,5 +922,6 @@ async function RedirectFileConverter({
   RedirectClient,
   RedirectFileConverter,
   UncachedRedirectClient,
-  WithMemoryCache
+  WithMemoryCache,
+  processUrl
 });

package/dist/index.mjs

@@ -197,6 +197,23 @@ var PathTrieData = class {
 
 // src/redirectClient.ts
 import { ApiClient } from "@uniformdev/context/api";
+
+// src/util/url.ts
+function processUrl(url) {
+  var _a, _b, _c, _d, _e, _f;
+  const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
+  return {
+    url,
+    protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
+    domain: (_b = matches == null ? void 0 : matches[3]) != null ? _b : "",
+    port: (_c = matches == null ? void 0 : matches[4]) != null ? _c : "",
+    path: (_d = matches == null ? void 0 : matches[5]) != null ? _d : "",
+    query: (_e = matches == null ? void 0 : matches[6]) != null ? _e : "",
+    fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
+  };
+}
+
+// src/redirectClient.ts
 var _RedirectClient = class extends ApiClient {
   constructor(options) {
     super(options);
@@ -223,8 +240,8 @@ var _RedirectClient = class extends ApiClient {
         if (result)
           return result;
       }
-      const ret = this.assembleTrie(projectId, options);
-      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie(projectId, options));
+      const ret = this.assembleTrie(projectId);
+      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie(projectId));
       return ret;
     };
     this.resetRedirectTrieDataCache = async () => {
@@ -302,25 +319,37 @@ var _RedirectClient = class extends ApiClient {
       }
     }
   }
-  async assembleTrie(projectId, options) {
-    var _a;
-    const trie = new PathTrie();
-    let offset = 0;
-    let total = 0;
-    do {
+  async *getAllRedirects(orderBy = "updated_at desc") {
+    var _a, _b;
+    const { projectId } = this.options;
+    let requestCount = 0;
+    let results = void 0;
+    while (requestCount === 0 || ((_a = results == null ? void 0 : results.redirects) == null ? void 0 : _a.length)) {
       const fetchUri = this.createUrl("/api/v1/redirect", {
-        projectId,
         limit: 50,
-        offset
+        offset: requestCount * 50,
+        orderBy,
+        projectId
       });
-      const redirects = await this.apiClient(fetchUri);
-      trie.insertMany(
-        redirects.redirects,
-        (r) => (options == null ? void 0 : options.reverse) ? r.redirect.targetUrl : r.redirect.sourceUrl
-      );
-      total = (_a = redirects.total) != null ? _a : 0;
-      offset += 50;
-    } while (offset < total);
+      results = await this.apiClient(fetchUri);
+      const redirectCount = results.redirects.length;
+      for (let i = 0; i < redirectCount; i++) {
+        yield { total: results.total, ...results.redirects[i] };
+      }
+      requestCount++;
+      if (requestCount * 50 > ((_b = results.total) != null ? _b : 0)) {
+        break;
+      }
+    }
+  }
+  async assembleTrie(projectId, options) {
+    const trie = new PathTrie();
+    for await (const redirect of this.getAllRedirects()) {
+      const path = processUrl(
+        (options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl
+      ).path;
+      trie.insert(path, redirect);
+    }
     return trie;
   }
   static processHops(url, trie, bestMatch, options) {
@@ -368,7 +397,7 @@ var _RedirectClient = class extends ApiClient {
     return ret;
   }
   static processHop(url, trie, bestMatch, options) {
-    const processedUrl = this.processUrl(url);
+    const processedUrl = processUrl(url);
     let definition = trie.find(url, false);
     if (!(definition == null ? void 0 : definition.length)) {
       definition = trie.find(processedUrl.path + processedUrl.query, bestMatch);
@@ -377,7 +406,7 @@ var _RedirectClient = class extends ApiClient {
       definition = trie.find(processedUrl.path, bestMatch);
     }
     if (definition == null ? void 0 : definition.length) {
-      return definition.map(
+      return definition.filter((def) => _RedirectClient.validateRedirect(url, def.data.redirect)).map(
         (def) => this.processDefinitionToResults(processedUrl, def.data, def.variables, options)
       ).filter((r) => Boolean(r));
     }
@@ -393,7 +422,7 @@ var _RedirectClient = class extends ApiClient {
   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 = this.processUrl(resultUrl);
+    const processedResult = processUrl(resultUrl);
     const redirect = definition == null ? void 0 : definition.redirect;
     if (redirect.sourceMustMatchDomain && processedUrl.domain !== processedResult.domain)
       return void 0;
@@ -411,11 +440,28 @@ var _RedirectClient = class extends ApiClient {
       }, finalUrl) : void 0
     };
   }
+  static validateRedirect(url, redirectDefinition) {
+    const processedSource = processUrl(redirectDefinition.sourceUrl);
+    const processedUrl = processUrl(url);
+    if (redirectDefinition.sourceMustMatchDomain && processedSource.domain !== processedUrl.domain)
+      return false;
+    if (processedSource.query && !processedUrl.query)
+      return false;
+    if (processedSource.query && processedUrl.query) {
+      const sourceqs = new URLSearchParams(processedSource.query);
+      const urlqs = new URLSearchParams(processedUrl.query);
+      for (const [key] of sourceqs) {
+        if (!urlqs.has(key) || urlqs.get(key) !== sourceqs.get(key))
+          return false;
+      }
+    }
+    return true;
+  }
   static getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
-    const processedTarget = this.processUrl(redirectDefinition.targetUrl);
-    const processedSource = this.processUrl(redirectDefinition.sourceUrl);
+    const processedTarget = processUrl(redirectDefinition.targetUrl);
+    const processedSource = processUrl(redirectDefinition.sourceUrl);
     let finalUrlPath = processedTarget.path;
-    const processedUrl = this.processUrl(url);
+    const processedUrl = processUrl(url);
     const variables = this.getSourceVariables(processedUrl.path, processedSource.path, isVariable);
     for (const variable in variables) {
       finalUrlPath = finalUrlPath.replace(variable, variables[variable]);
@@ -458,19 +504,6 @@ var _RedirectClient = class extends ApiClient {
     });
     return variables;
   }
-  static processUrl(url) {
-    var _a, _b, _c, _d, _e, _f;
-    const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
-    return {
-      url,
-      protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
-      domain: (_b = matches == null ? void 0 : matches[3]) != null ? _b : "",
-      port: (_c = matches == null ? void 0 : matches[4]) != null ? _c : "",
-      path: (_d = matches == null ? void 0 : matches[5]) != null ? _d : "",
-      query: (_e = matches == null ? void 0 : matches[6]) != null ? _e : "",
-      fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
-    };
-  }
 };
 var RedirectClient = _RedirectClient;
 RedirectClient.processUrlBestMatch = async (url, trie, options) => {
@@ -485,7 +518,7 @@ var UncachedRedirectClient = class extends RedirectClient {
 
 // src/util/RedirectFileConverter.ts
 var getDefaultClient = async () => {
-  const dotenv = await import("./main-NHOL4NFR.mjs");
+  const dotenv = await import("./main-DHQ5ANFI.mjs");
   dotenv.config();
   return new RedirectClient({
     apiKey: process.env.UNIFORM_API_KEY,
@@ -562,5 +595,6 @@ export {
   RedirectClient,
   RedirectFileConverter,
   UncachedRedirectClient,
-  WithMemoryCache
+  WithMemoryCache,
+  processUrl
 };

package/dist/main-DHQ5ANFI.mjs

@@ -0,0 +1,287 @@
+import {
+  __commonJS,
+  __require
+} from "./chunk-FFYIGW52.mjs";
+
+// ../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/package.json
+var require_package = __commonJS({
+  "../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/package.json"(exports, module) {
+    module.exports = {
+      name: "dotenv",
+      version: "16.1.3",
+      description: "Loads environment variables from .env file",
+      main: "lib/main.js",
+      types: "lib/main.d.ts",
+      exports: {
+        ".": {
+          types: "./lib/main.d.ts",
+          require: "./lib/main.js",
+          default: "./lib/main.js"
+        },
+        "./config": "./config.js",
+        "./config.js": "./config.js",
+        "./lib/env-options": "./lib/env-options.js",
+        "./lib/env-options.js": "./lib/env-options.js",
+        "./lib/cli-options": "./lib/cli-options.js",
+        "./lib/cli-options.js": "./lib/cli-options.js",
+        "./package.json": "./package.json"
+      },
+      scripts: {
+        "dts-check": "tsc --project tests/types/tsconfig.json",
+        lint: "standard",
+        "lint-readme": "standard-markdown",
+        pretest: "npm run lint && npm run dts-check",
+        test: "tap tests/*.js --100 -Rspec",
+        prerelease: "npm test",
+        release: "standard-version"
+      },
+      repository: {
+        type: "git",
+        url: "git://github.com/motdotla/dotenv.git"
+      },
+      funding: "https://github.com/motdotla/dotenv?sponsor=1",
+      keywords: [
+        "dotenv",
+        "env",
+        ".env",
+        "environment",
+        "variables",
+        "config",
+        "settings"
+      ],
+      readmeFilename: "README.md",
+      license: "BSD-2-Clause",
+      devDependencies: {
+        "@definitelytyped/dtslint": "^0.0.133",
+        "@types/node": "^18.11.3",
+        decache: "^4.6.1",
+        sinon: "^14.0.1",
+        standard: "^17.0.0",
+        "standard-markdown": "^7.1.0",
+        "standard-version": "^9.5.0",
+        tap: "^16.3.0",
+        tar: "^6.1.11",
+        typescript: "^4.8.4"
+      },
+      engines: {
+        node: ">=12"
+      },
+      browser: {
+        fs: false
+      }
+    };
+  }
+});
+
+// ../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/lib/main.js
+var require_main = __commonJS({
+  "../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/lib/main.js"(exports, module) {
+    var fs = __require("fs");
+    var path = __require("path");
+    var os = __require("os");
+    var crypto = __require("crypto");
+    var packageJson = require_package();
+    var version = packageJson.version;
+    var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
+    function parse(src) {
+      const obj = {};
+      let lines = src.toString();
+      lines = lines.replace(/\r\n?/mg, "\n");
+      let match;
+      while ((match = LINE.exec(lines)) != null) {
+        const key = match[1];
+        let value = match[2] || "";
+        value = value.trim();
+        const maybeQuote = value[0];
+        value = value.replace(/^(['"`])([\s\S]*)\1$/mg, "$2");
+        if (maybeQuote === '"') {
+          value = value.replace(/\\n/g, "\n");
+          value = value.replace(/\\r/g, "\r");
+        }
+        obj[key] = value;
+      }
+      return obj;
+    }
+    function _parseVault(options) {
+      const vaultPath = _vaultPath(options);
+      const result = DotenvModule.configDotenv({ path: vaultPath });
+      if (!result.parsed) {
+        throw new Error(`MISSING_DATA: Cannot parse ${vaultPath} for an unknown reason`);
+      }
+      const keys = _dotenvKey().split(",");
+      const length = keys.length;
+      let decrypted;
+      for (let i = 0; i < length; i++) {
+        try {
+          const key = keys[i].trim();
+          const attrs = _instructions(result, key);
+          decrypted = DotenvModule.decrypt(attrs.ciphertext, attrs.key);
+          break;
+        } catch (error) {
+          if (i + 1 >= length) {
+            throw error;
+          }
+        }
+      }
+      return DotenvModule.parse(decrypted);
+    }
+    function _log(message) {
+      console.log(`[dotenv@${version}][INFO] ${message}`);
+    }
+    function _warn(message) {
+      console.log(`[dotenv@${version}][WARN] ${message}`);
+    }
+    function _debug(message) {
+      console.log(`[dotenv@${version}][DEBUG] ${message}`);
+    }
+    function _dotenvKey() {
+      if (process.env.DOTENV_KEY && process.env.DOTENV_KEY.length > 0) {
+        return process.env.DOTENV_KEY;
+      }
+      return "";
+    }
+    function _instructions(result, dotenvKey) {
+      let uri;
+      try {
+        uri = new URL(dotenvKey);
+      } catch (error) {
+        if (error.code === "ERR_INVALID_URL") {
+          throw new Error("INVALID_DOTENV_KEY: Wrong format. Must be in valid uri format like dotenv://:key_1234@dotenv.org/vault/.env.vault?environment=development");
+        }
+        throw error;
+      }
+      const key = uri.password;
+      if (!key) {
+        throw new Error("INVALID_DOTENV_KEY: Missing key part");
+      }
+      const environment = uri.searchParams.get("environment");
+      if (!environment) {
+        throw new Error("INVALID_DOTENV_KEY: Missing environment part");
+      }
+      const environmentKey = `DOTENV_VAULT_${environment.toUpperCase()}`;
+      const ciphertext = result.parsed[environmentKey];
+      if (!ciphertext) {
+        throw new Error(`NOT_FOUND_DOTENV_ENVIRONMENT: Cannot locate environment ${environmentKey} in your .env.vault file.`);
+      }
+      return { ciphertext, key };
+    }
+    function _vaultPath(options) {
+      let dotenvPath = path.resolve(process.cwd(), ".env");
+      if (options && options.path && options.path.length > 0) {
+        dotenvPath = options.path;
+      }
+      return dotenvPath.endsWith(".vault") ? dotenvPath : `${dotenvPath}.vault`;
+    }
+    function _resolveHome(envPath) {
+      return envPath[0] === "~" ? path.join(os.homedir(), envPath.slice(1)) : envPath;
+    }
+    function _configVault(options) {
+      _log("Loading env from encrypted .env.vault");
+      const parsed = DotenvModule._parseVault(options);
+      DotenvModule.populate(process.env, parsed, options);
+      return { parsed };
+    }
+    function configDotenv(options) {
+      let dotenvPath = path.resolve(process.cwd(), ".env");
+      let encoding = "utf8";
+      const debug = Boolean(options && options.debug);
+      if (options) {
+        if (options.path != null) {
+          dotenvPath = _resolveHome(options.path);
+        }
+        if (options.encoding != null) {
+          encoding = options.encoding;
+        }
+      }
+      try {
+        const parsed = DotenvModule.parse(fs.readFileSync(dotenvPath, { encoding }));
+        DotenvModule.populate(process.env, parsed, options);
+        return { parsed };
+      } catch (e) {
+        if (debug) {
+          _debug(`Failed to load ${dotenvPath} ${e.message}`);
+        }
+        return { error: e };
+      }
+    }
+    function config(options) {
+      const vaultPath = _vaultPath(options);
+      if (_dotenvKey().length === 0) {
+        return DotenvModule.configDotenv(options);
+      }
+      if (!fs.existsSync(vaultPath)) {
+        _warn(`You set DOTENV_KEY but you are missing a .env.vault file at ${vaultPath}. Did you forget to build it?`);
+        return DotenvModule.configDotenv(options);
+      }
+      return DotenvModule._configVault(options);
+    }
+    function decrypt(encrypted, keyStr) {
+      const key = Buffer.from(keyStr.slice(-64), "hex");
+      let ciphertext = Buffer.from(encrypted, "base64");
+      const nonce = ciphertext.slice(0, 12);
+      const authTag = ciphertext.slice(-16);
+      ciphertext = ciphertext.slice(12, -16);
+      try {
+        const aesgcm = crypto.createDecipheriv("aes-256-gcm", key, nonce);
+        aesgcm.setAuthTag(authTag);
+        return `${aesgcm.update(ciphertext)}${aesgcm.final()}`;
+      } catch (error) {
+        const isRange = error instanceof RangeError;
+        const invalidKeyLength = error.message === "Invalid key length";
+        const decryptionFailed = error.message === "Unsupported state or unable to authenticate data";
+        if (isRange || invalidKeyLength) {
+          const msg = "INVALID_DOTENV_KEY: It must be 64 characters long (or more)";
+          throw new Error(msg);
+        } else if (decryptionFailed) {
+          const msg = "DECRYPTION_FAILED: Please check your DOTENV_KEY";
+          throw new Error(msg);
+        } else {
+          console.error("Error: ", error.code);
+          console.error("Error: ", error.message);
+          throw error;
+        }
+      }
+    }
+    function populate(processEnv, parsed, options = {}) {
+      const debug = Boolean(options && options.debug);
+      const override = Boolean(options && options.override);
+      if (typeof parsed !== "object") {
+        throw new Error("OBJECT_REQUIRED: Please check the processEnv argument being passed to populate");
+      }
+      for (const key of Object.keys(parsed)) {
+        if (Object.prototype.hasOwnProperty.call(processEnv, key)) {
+          if (override === true) {
+            processEnv[key] = parsed[key];
+          }
+          if (debug) {
+            if (override === true) {
+              _debug(`"${key}" is already defined and WAS overwritten`);
+            } else {
+              _debug(`"${key}" is already defined and was NOT overwritten`);
+            }
+          }
+        } else {
+          processEnv[key] = parsed[key];
+        }
+      }
+    }
+    var DotenvModule = {
+      configDotenv,
+      _configVault,
+      _parseVault,
+      config,
+      decrypt,
+      parse,
+      populate
+    };
+    module.exports.configDotenv = DotenvModule.configDotenv;
+    module.exports._configVault = DotenvModule._configVault;
+    module.exports._parseVault = DotenvModule._parseVault;
+    module.exports.config = DotenvModule.config;
+    module.exports.decrypt = DotenvModule.decrypt;
+    module.exports.parse = DotenvModule.parse;
+    module.exports.populate = DotenvModule.populate;
+    module.exports = DotenvModule;
+  }
+});
+export default require_main();

package/package.json

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

package/dist/main-NHOL4NFR.mjs

@@ -1,154 +0,0 @@
-import {
-  __commonJS,
-  __require
-} from "./chunk-FFYIGW52.mjs";
-
-// ../../node_modules/.pnpm/dotenv@16.0.3/node_modules/dotenv/package.json
-var require_package = __commonJS({
-  "../../node_modules/.pnpm/dotenv@16.0.3/node_modules/dotenv/package.json"(exports, module) {
-    module.exports = {
-      name: "dotenv",
-      version: "16.0.3",
-      description: "Loads environment variables from .env file",
-      main: "lib/main.js",
-      types: "lib/main.d.ts",
-      exports: {
-        ".": {
-          require: "./lib/main.js",
-          types: "./lib/main.d.ts",
-          default: "./lib/main.js"
-        },
-        "./config": "./config.js",
-        "./config.js": "./config.js",
-        "./lib/env-options": "./lib/env-options.js",
-        "./lib/env-options.js": "./lib/env-options.js",
-        "./lib/cli-options": "./lib/cli-options.js",
-        "./lib/cli-options.js": "./lib/cli-options.js",
-        "./package.json": "./package.json"
-      },
-      scripts: {
-        "dts-check": "tsc --project tests/types/tsconfig.json",
-        lint: "standard",
-        "lint-readme": "standard-markdown",
-        pretest: "npm run lint && npm run dts-check",
-        test: "tap tests/*.js --100 -Rspec",
-        prerelease: "npm test",
-        release: "standard-version"
-      },
-      repository: {
-        type: "git",
-        url: "git://github.com/motdotla/dotenv.git"
-      },
-      keywords: [
-        "dotenv",
-        "env",
-        ".env",
-        "environment",
-        "variables",
-        "config",
-        "settings"
-      ],
-      readmeFilename: "README.md",
-      license: "BSD-2-Clause",
-      devDependencies: {
-        "@types/node": "^17.0.9",
-        decache: "^4.6.1",
-        dtslint: "^3.7.0",
-        sinon: "^12.0.1",
-        standard: "^16.0.4",
-        "standard-markdown": "^7.1.0",
-        "standard-version": "^9.3.2",
-        tap: "^15.1.6",
-        tar: "^6.1.11",
-        typescript: "^4.5.4"
-      },
-      engines: {
-        node: ">=12"
-      }
-    };
-  }
-});
-
-// ../../node_modules/.pnpm/dotenv@16.0.3/node_modules/dotenv/lib/main.js
-var require_main = __commonJS({
-  "../../node_modules/.pnpm/dotenv@16.0.3/node_modules/dotenv/lib/main.js"(exports, module) {
-    var fs = __require("fs");
-    var path = __require("path");
-    var os = __require("os");
-    var packageJson = require_package();
-    var version = packageJson.version;
-    var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
-    function parse(src) {
-      const obj = {};
-      let lines = src.toString();
-      lines = lines.replace(/\r\n?/mg, "\n");
-      let match;
-      while ((match = LINE.exec(lines)) != null) {
-        const key = match[1];
-        let value = match[2] || "";
-        value = value.trim();
-        const maybeQuote = value[0];
-        value = value.replace(/^(['"`])([\s\S]*)\1$/mg, "$2");
-        if (maybeQuote === '"') {
-          value = value.replace(/\\n/g, "\n");
-          value = value.replace(/\\r/g, "\r");
-        }
-        obj[key] = value;
-      }
-      return obj;
-    }
-    function _log(message) {
-      console.log(`[dotenv@${version}][DEBUG] ${message}`);
-    }
-    function _resolveHome(envPath) {
-      return envPath[0] === "~" ? path.join(os.homedir(), envPath.slice(1)) : envPath;
-    }
-    function config(options) {
-      let dotenvPath = path.resolve(process.cwd(), ".env");
-      let encoding = "utf8";
-      const debug = Boolean(options && options.debug);
-      const override = Boolean(options && options.override);
-      if (options) {
-        if (options.path != null) {
-          dotenvPath = _resolveHome(options.path);
-        }
-        if (options.encoding != null) {
-          encoding = options.encoding;
-        }
-      }
-      try {
-        const parsed = DotenvModule.parse(fs.readFileSync(dotenvPath, { encoding }));
-        Object.keys(parsed).forEach(function(key) {
-          if (!Object.prototype.hasOwnProperty.call(process.env, key)) {
-            process.env[key] = parsed[key];
-          } else {
-            if (override === true) {
-              process.env[key] = parsed[key];
-            }
-            if (debug) {
-              if (override === true) {
-                _log(`"${key}" is already defined in \`process.env\` and WAS overwritten`);
-              } else {
-                _log(`"${key}" is already defined in \`process.env\` and was NOT overwritten`);
-              }
-            }
-          }
-        });
-        return { parsed };
-      } catch (e) {
-        if (debug) {
-          _log(`Failed to load ${dotenvPath} ${e.message}`);
-        }
-        return { error: e };
-      }
-    }
-    var DotenvModule = {
-      config,
-      parse
-    };
-    module.exports.config = DotenvModule.config;
-    module.exports.parse = DotenvModule.parse;
-    module.exports = DotenvModule;
-  }
-});
-export default require_main();