@discomedia/utils 1.0.12 → 1.0.14

package/dist/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.0.12",
+  "version": "1.0.14",
   "author": "Disco Media",
   "description": "Utility functions used in Disco Media apps",
   "always-build-npm": true,
@@ -34,9 +34,9 @@
   "dependencies": {
     "date-fns": "^4.1.0",
     "date-fns-tz": "^3.2.0",
-    "dotenv": "^17.1.0",
+    "dotenv": "^17.2.0",
     "ms": "^2.1.3",
-    "openai": "^5.8.3",
+    "openai": "^5.9.0",
     "p-limit": "^6.2.0",
     "ws": "^8.18.3"
   },
@@ -50,7 +50,7 @@
     "@types/ms": "^2.1.0",
     "@types/ws": "^8.18.1",
     "lightweight-charts": "^5.0.8",
-    "rollup": "^4.44.2",
+    "rollup": "^4.45.0",
     "typescript": "^5.8.3"
   }
 }

package/dist/test.js

@@ -7,7 +7,7 @@ var config = {};
 
 var main = {exports: {}};
 
-var version = "17.1.0";
+var version = "17.2.0";
 var require$$4 = {
 	version: version};
 
@@ -43,6 +43,13 @@ function requireMain () {
 	  return TIPS[Math.floor(Math.random() * TIPS.length)]
 	}
 
+	function parseBoolean (value) {
+	  if (typeof value === 'string') {
+	    return !['false', '0', 'no', 'off', ''].includes(value.toLowerCase())
+	  }
+	  return Boolean(value)
+	}
+
 	function supportsAnsi () {
 	  return process.stdout.isTTY // && process.env.TERM !== 'dumb'
 	}
@@ -234,8 +241,8 @@ function requireMain () {
 	}
 
 	function _configVault (options) {
-	  const debug = Boolean(options && options.debug);
-	  const quiet = Boolean(options && options.quiet);
+	  const debug = parseBoolean(process.env.DOTENV_CONFIG_DEBUG || (options && options.debug));
+	  const quiet = parseBoolean(process.env.DOTENV_CONFIG_QUIET || (options && options.quiet));
 
 	  if (debug || !quiet) {
 	    _log('Loading env from encrypted .env.vault');
@@ -256,8 +263,12 @@ function requireMain () {
 	function configDotenv (options) {
 	  const dotenvPath = path.resolve(process.cwd(), '.env');
 	  let encoding = 'utf8';
-	  const debug = Boolean(options && options.debug);
-	  const quiet = Boolean(options && options.quiet);
+	  let processEnv = process.env;
+	  if (options && options.processEnv != null) {
+	    processEnv = options.processEnv;
+	  }
+	  let debug = parseBoolean(processEnv.DOTENV_CONFIG_DEBUG || (options && options.debug));
+	  let quiet = parseBoolean(processEnv.DOTENV_CONFIG_QUIET || (options && options.quiet));
 
 	  if (options && options.encoding) {
 	    encoding = options.encoding;
@@ -297,13 +308,12 @@ function requireMain () {
 	    }
 	  }
 
-	  let processEnv = process.env;
-	  if (options && options.processEnv != null) {
-	    processEnv = options.processEnv;
-	  }
-
 	  const populated = DotenvModule.populate(processEnv, parsedAll, options);
 
+	  // handle user settings DOTENV_CONFIG_ options inside .env file(s)
+	  debug = parseBoolean(processEnv.DOTENV_CONFIG_DEBUG || debug);
+	  quiet = parseBoolean(processEnv.DOTENV_CONFIG_QUIET || quiet);
+
 	  if (debug || !quiet) {
 	    const keysCount = Object.keys(populated).length;
 	    const shortPaths = [];
@@ -750,7 +760,7 @@ const safeJSON = (text) => {
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
-const VERSION = '5.8.3'; // x-release-please-version
+const VERSION = '5.9.0'; // x-release-please-version
 
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 const isRunningInBrowser = () => {
@@ -6823,7 +6833,7 @@ class OpenAI {
      * Create a new client instance re-using the same options given to the current client with optional overriding.
      */
     withOptions(options) {
-        return new this.constructor({
+        const client = new this.constructor({
             ...this._options,
             baseURL: this.baseURL,
             maxRetries: this.maxRetries,
@@ -6838,6 +6848,7 @@ class OpenAI {
             webhookSecret: this.webhookSecret,
             ...options,
         });
+        return client;
     }
     defaultQuery() {
         return this._options.defaultQuery;
@@ -6845,7 +6856,7 @@ class OpenAI {
     validateHeaders({ values, nulls }) {
         return;
     }
-    authHeaders(opts) {
+    async authHeaders(opts) {
         return buildHeaders([{ Authorization: `Bearer ${this.apiKey}` }]);
     }
     stringifyQuery(query) {
@@ -6915,7 +6926,9 @@ class OpenAI {
             retriesRemaining = maxRetries;
         }
         await this.prepareOptions(options);
-        const { req, url, timeout } = this.buildRequest(options, { retryCount: maxRetries - retriesRemaining });
+        const { req, url, timeout } = await this.buildRequest(options, {
+            retryCount: maxRetries - retriesRemaining,
+        });
         await this.prepareRequest(req, { url, options });
         /** Not an API request ID, just for correlating local log entries. */
         const requestLogID = 'log_' + ((Math.random() * (1 << 24)) | 0).toString(16).padStart(6, '0');
@@ -6973,7 +6986,7 @@ class OpenAI {
             .join('');
         const responseInfo = `[${requestLogID}${retryLogStr}${specialHeaders}] ${req.method} ${url} ${response.ok ? 'succeeded' : 'failed'} with status ${response.status} in ${headersTime - startTime}ms`;
         if (!response.ok) {
-            const shouldRetry = this.shouldRetry(response);
+            const shouldRetry = await this.shouldRetry(response);
             if (retriesRemaining && shouldRetry) {
                 const retryMessage = `retrying, ${retriesRemaining} attempts remaining`;
                 // We don't need the body of this response.
@@ -7047,7 +7060,7 @@ class OpenAI {
             clearTimeout(timeout);
         }
     }
-    shouldRetry(response) {
+    async shouldRetry(response) {
         // Note this is not a standard header.
         const shouldRetryHeader = response.headers.get('x-should-retry');
         // If the server explicitly says whether or not to retry, obey.
@@ -7109,7 +7122,7 @@ class OpenAI {
         const jitter = 1 - Math.random() * 0.25;
         return sleepSeconds * jitter * 1000;
     }
-    buildRequest(inputOptions, { retryCount = 0 } = {}) {
+    async buildRequest(inputOptions, { retryCount = 0 } = {}) {
         const options = { ...inputOptions };
         const { method, path, query, defaultBaseURL } = options;
         const url = this.buildURL(path, query, defaultBaseURL);
@@ -7117,7 +7130,7 @@ class OpenAI {
             validatePositiveInteger('timeout', options.timeout);
         options.timeout = options.timeout ?? this.timeout;
         const { bodyHeaders, body } = this.buildBody({ options });
-        const reqHeaders = this.buildHeaders({ options: inputOptions, method, bodyHeaders, retryCount });
+        const reqHeaders = await this.buildHeaders({ options: inputOptions, method, bodyHeaders, retryCount });
         const req = {
             method,
             headers: reqHeaders,
@@ -7130,7 +7143,7 @@ class OpenAI {
         };
         return { req, url, timeout: options.timeout };
     }
-    buildHeaders({ options, method, bodyHeaders, retryCount, }) {
+    async buildHeaders({ options, method, bodyHeaders, retryCount, }) {
         let idempotencyHeaders = {};
         if (this.idempotencyHeader && method !== 'get') {
             if (!options.idempotencyKey)
@@ -7148,7 +7161,7 @@ class OpenAI {
                 'OpenAI-Organization': this.organization,
                 'OpenAI-Project': this.project,
             },
-            this.authHeaders(options),
+            await this.authHeaders(options),
             this._options.defaultHeaders,
             bodyHeaders,
             options.headers,