@auxilium/datalynk-client 0.9.0 → 0.9.1

package/bin/datalynk-models.mjs

@@ -3,7 +3,7 @@
 import fs from 'fs';
 import {join} from 'path';
 import {Api} from '../dist/index.mjs';
-import * as readline from 'node:readline';
+import {ask} from '@ztimson/node-utils';
 
 const FieldType = {
     'control_checkbox': 'checkbox',
@@ -28,48 +28,6 @@ const universalFields = [
     {id: 'modifierRef', readonly: true, type: 'number'}
 ]
 
-// Promise wrapper for reading console input
-function ask(prompt, hide = false) {
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-        terminal: true
-    });
-
-    return new Promise((resolve) => {
-        if (!hide) {
-            rl.question(prompt, (answer) => {
-                rl.close();
-                resolve(answer);
-            });
-        } else {
-            rl.output.write(prompt);
-            let input = '';
-
-            // Listen for 'keypress' to handle masking
-            rl.input.on('keypress', (char, key) => {
-                if (key && key.name === 'return') {
-                    rl.output.write('\n'); // Submit on new line
-                    rl.close();
-                    resolve(input);
-                } else if (key && key.name === 'backspace') {
-                    if (input.length > 0) {
-                        input = input.slice(0, -1);
-                        rl.output.write(`\r${prompt}${input.replaceAll(/./g, '*')} \b`);
-                    }
-                } else {
-                    input += char;
-                    rl.output.write('\b*'); // Mask the input with '*'
-                }
-            });
-
-            // Restore settings
-            rl.input.setRawMode(true);
-            rl.input.resume();
-        }
-    });
-}
-
 // Shorthand for getting spoke credentials
 async function getCredentials(out, spoke, login, password) {
     if(!out) out = await ask('Output (src/models): ') || 'src/models';

package/dist/auth.d.ts

@@ -91,10 +91,13 @@ export declare class Auth {
      * @param {string} login Login username or email
      * @param {string} password Password for account
      * @param {string} spoke Override login spoke
-     * @param {string} twoFactor 2FA code
+     * @param {twoFactor?: string, expire?: string} opts 2FA code & expire date (YYYY-MM-DD)
      * @returns {Promise<any>} Session information returned from login request
      */
-    login(spoke: string, login: string, password: string, twoFactor?: string): Promise<any>;
+    login(spoke: string, login: string, password: string, opts?: {
+        twoFactor?: string;
+        expire?: null | string;
+    }): Promise<any>;
     /**
      * Login as guest user
      *

package/dist/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,MAAM,CAAC;AACrC,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAc,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAE/D,mBAAmB;AACnB,MAAM,MAAM,IAAI,GAAG;IAClB,cAAc;IACd,EAAE,EAAE,MAAM,CAAC;IACX,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,KAAK,EAAE,OAAO,CAAC;IACf,kCAAkC;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,+BAA+B;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2BAA2B;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;CACd,CAAA;AAED;;GAEG;AACH,qBAAa,IAAI;IAUJ,OAAO,CAAC,QAAQ,CAAC,GAAG;IAThC,oCAAoC;IACpC,KAAK,+BAA0C;IAC/C,mBAAmB;IACnB,IAAI,IAAI,IAEO,IAAI,GAAG,IAAI,CAFkB;IAC5C,4BAA4B;IAC5B,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAA4B;IAEtD,IAAI,KAAK,kBAAiD;gBAE7B,GAAG,EAAE,GAAG;IAErC;;;;OAIG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAW/B;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB7E;;;;OAIG;IACH,eAAe;IAEf;;;;OAIG;IACH,OAAO;IAEP;;;;OAIG;IACG,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAOpC;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAOtC;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAOrC;;;;;;;;OAQG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAkBvF;;;;OAIG;IACH,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC;IAS1B;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvE;;;;OAIG;IACH,MAAM;gBAC6B,MAAM;aAAO,MAAM;;IAOtD;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAWvD;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,KAAK,GAAG,OAAO;CAI3D"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,MAAM,CAAC;AACrC,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAc,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAE/D,mBAAmB;AACnB,MAAM,MAAM,IAAI,GAAG;IAClB,cAAc;IACd,EAAE,EAAE,MAAM,CAAC;IACX,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,KAAK,EAAE,OAAO,CAAC;IACf,kCAAkC;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,+BAA+B;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2BAA2B;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;CACd,CAAA;AAED;;GAEG;AACH,qBAAa,IAAI;IAUJ,OAAO,CAAC,QAAQ,CAAC,GAAG;IAThC,oCAAoC;IACpC,KAAK,+BAA0C;IAC/C,mBAAmB;IACnB,IAAI,IAAI,IAEO,IAAI,GAAG,IAAI,CAFkB;IAC5C,4BAA4B;IAC5B,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAA4B;IAEtD,IAAI,KAAK,kBAAiD;gBAE7B,GAAG,EAAE,GAAG;IAErC;;;;OAIG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAW/B;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB7E;;;;OAIG;IACH,eAAe;IAEf;;;;OAIG;IACH,OAAO;IAEP;;;;OAIG;IACG,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAOpC;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAOtC;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAOrC;;;;;;;;OAQG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAqBxH;;;;OAIG;IACH,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC;IAS1B;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvE;;;;OAIG;IACH,MAAM;gBAC6B,MAAM;aAAO,MAAM;;IAOtD;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAWvD;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,KAAK,GAAG,OAAO;CAI3D"}

package/dist/index.cjs

@@ -6,22 +6,22 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
   var __defProp2 = Object.defineProperty;
-  var __defNormalProp2 = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField2 = (obj, key, value) => __defNormalProp2(obj, typeof key !== "symbol" ? key + "" : key, value);
+  var __defNormalProp2 = (obj, key, value2) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value: value2 }) : obj[key] = value2;
+  var __publicField2 = (obj, key, value2) => __defNormalProp2(obj, typeof key !== "symbol" ? key + "" : key, value2);
   function clean(obj, undefinedOnly = false) {
     if (obj == null) throw new Error("Cannot clean a NULL value");
     if (Array.isArray(obj)) {
       obj = obj.filter((o) => o != null);
     } else {
-      Object.entries(obj).forEach(([key, value]) => {
-        if (undefinedOnly && value === void 0 || !undefinedOnly && value == null) delete obj[key];
+      Object.entries(obj).forEach(([key, value2]) => {
+        if (undefinedOnly && value2 === void 0 || !undefinedOnly && value2 == null) delete obj[key];
       });
     }
     return obj;
   }
   function formData(target) {
     const data = new FormData();
-    Object.entries(target).forEach(([key, value]) => data.append(key, value));
+    Object.entries(target).forEach(([key, value2]) => data.append(key, value2));
     return data;
   }
   function JSONAttemptParse(json) {
@@ -32,19 +32,14 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
   }
   function JSONSanitize(obj, space) {
-    let cache = [];
-    return JSON.stringify(obj, (key, value) => {
-      if (typeof value === "object" && value !== null) {
-        if (cache.includes(value)) return;
-        cache.push(value);
-      }
-      return value;
+    return JSON.stringify(obj, (key, value2) => {
+      return value2;
     }, space);
   }
   class PromiseProgress extends Promise {
     constructor(executor) {
       super((resolve, reject) => executor(
-        (value) => resolve(value),
+        (value2) => resolve(value2),
         (reason) => reject(reason),
         (progress) => this.progress = progress
       ));
@@ -54,10 +49,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     get progress() {
       return this._progress;
     }
-    set progress(p) {
-      if (p == this._progress) return;
-      this._progress = p;
-      this.listeners.forEach((l) => l(p));
+    set progress(p2) {
+      if (p2 == this._progress) return;
+      this._progress = p2;
+      this.listeners.forEach((l) => l(p2));
     }
     static from(promise) {
       if (promise instanceof PromiseProgress) return promise;
@@ -65,7 +60,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     from(promise) {
       const newPromise = PromiseProgress.from(promise);
-      this.onProgress((p) => newPromise.progress = p);
+      this.onProgress((p2) => newPromise.progress = p2);
       return newPromise;
     }
     onProgress(callback) {
@@ -467,6 +462,106 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
   };
   __publicField2(_Logger, "LOG_LEVEL", 4);
+  function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(), tz) {
+    const timezones = [
+      ["IDLW", -12],
+      ["SST", -11],
+      ["HST", -10],
+      ["AKST", -9],
+      ["PST", -8],
+      ["MST", -7],
+      ["CST", -6],
+      ["EST", -5],
+      ["AST", -4],
+      ["BRT", -3],
+      ["MAT", -2],
+      ["AZOT", -1],
+      ["UTC", 0],
+      ["CET", 1],
+      ["EET", 2],
+      ["MSK", 3],
+      ["AST", 4],
+      ["PKT", 5],
+      ["IST", 5.5],
+      ["BST", 6],
+      ["ICT", 7],
+      ["CST", 8],
+      ["JST", 9],
+      ["AEST", 10],
+      ["SBT", 11],
+      ["FJT", 12],
+      ["TOT", 13],
+      ["LINT", 14]
+    ];
+    function adjustTz(date2, gmt) {
+      const currentOffset = date2.getTimezoneOffset();
+      const adjustedOffset = gmt * 60;
+      return new Date(date2.getTime() + (adjustedOffset + currentOffset) * 6e4);
+    }
+    function day(num) {
+      return ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"][num] || "Unknown";
+    }
+    function doy(date2) {
+      const start = /* @__PURE__ */ new Date(`${date2.getFullYear()}-01-01 0:00:00`);
+      return Math.ceil((date2.getTime() - start.getTime()) / (1e3 * 60 * 60 * 24));
+    }
+    function month(num) {
+      return ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][num] || "Unknown";
+    }
+    function suffix(num) {
+      if (num % 100 >= 11 && num % 100 <= 13) return `${num}th`;
+      switch (num % 10) {
+        case 1:
+          return `${num}st`;
+        case 2:
+          return `${num}nd`;
+        case 3:
+          return `${num}rd`;
+        default:
+          return `${num}th`;
+      }
+    }
+    function tzOffset(offset) {
+      const hours = ~~(offset / 60);
+      const minutes = offset % 60;
+      return (offset > 0 ? "-" : "") + `${hours}:${minutes.toString().padStart(2, "0")}`;
+    }
+    if (typeof date == "number" || typeof date == "string") date = new Date(date);
+    let t;
+    if (tz == null) tz = -(date.getTimezoneOffset() / 60);
+    t = timezones.find((t2) => isNaN(tz) ? t2[0] == tz : t2[1] == tz);
+    if (!t) throw new Error(`Unknown timezone: ${tz}`);
+    date = adjustTz(date, t[1]);
+    const tokens = {
+      "YYYY": date.getFullYear().toString(),
+      "YY": date.getFullYear().toString().slice(2),
+      "MMMM": month(date.getMonth()),
+      "MMM": month(date.getMonth()).slice(0, 3),
+      "MM": (date.getMonth() + 1).toString().padStart(2, "0"),
+      "M": (date.getMonth() + 1).toString(),
+      "DDD": doy(date).toString(),
+      "DD": date.getDate().toString().padStart(2, "0"),
+      "Do": suffix(date.getDate()),
+      "D": date.getDate().toString(),
+      "dddd": day(date.getDay()),
+      "ddd": day(date.getDay()).slice(0, 3),
+      "HH": date.getHours().toString().padStart(2, "0"),
+      "H": date.getHours().toString(),
+      "hh": (date.getHours() % 12 || 12).toString().padStart(2, "0"),
+      "h": (date.getHours() % 12 || 12).toString(),
+      "mm": date.getMinutes().toString().padStart(2, "0"),
+      "m": date.getMinutes().toString(),
+      "ss": date.getSeconds().toString().padStart(2, "0"),
+      "s": date.getSeconds().toString(),
+      "SSS": date.getMilliseconds().toString().padStart(3, "0"),
+      "A": date.getHours() >= 12 ? "PM" : "AM",
+      "a": date.getHours() >= 12 ? "pm" : "am",
+      "ZZ": tzOffset(t[1] * 60).replace(":", ""),
+      "Z": tzOffset(t[1] * 60),
+      "z": typeof tz == "string" ? tz : t[0]
+    };
+    return format.replace(/YYYY|YY|MMMM|MMM|MM|M|DDD|DD|Do|D|dddd|ddd|HH|H|hh|h|mm|m|ss|s|SSS|A|a|ZZ|Z|z/g, (token) => tokens[token]);
+  }
   function sleep(ms) {
     return new Promise((res) => setTimeout(res, ms));
   }
@@ -1268,6 +1363,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       __publicField(this, "button");
       __publicField(this, "form");
       __publicField(this, "password");
+      __publicField(this, "persist");
       __publicField(this, "username");
       __publicField(this, "_done");
       /** Promise which resolves once login is complete */
@@ -1282,7 +1378,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       this.alert = document.querySelector("#datalynk-login-alert");
       this.button = document.querySelector("#datalynk-login-form button");
       this.form = document.querySelector("#datalynk-login-form");
-      this.password = document.querySelector('#datalynk-login-form input[name="password"]'), this.username = document.querySelector('#datalynk-login-form input[name="username"]'), this.form.onsubmit = (event) => this.login(event);
+      this.password = document.querySelector('#datalynk-login-form input[name="password"]');
+      this.persist = document.querySelector('#datalynk-login-form input[name="persist"]');
+      this.username = document.querySelector('#datalynk-login-form input[name="username"]');
+      this.form.onsubmit = (event) => this.login(event);
+      if (options.persist === false) this.persist.parentElement.style.display = "none";
     }
     /**
      * Close the login prompt
@@ -1303,8 +1403,14 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       this.alert.classList.add("hidden");
       this.username.disabled = true;
       this.password.disabled = true;
+      this.persist.disabled = true;
       this.button.disabled = true;
-      return this.api.auth.login(this.spoke, data.get("username"), data.get("password")).then((data2) => {
+      return this.api.auth.login(
+        this.spoke,
+        data.get("username"),
+        data.get("password"),
+        { expire: this.persist.checked ? null : void 0 }
+      ).then((data2) => {
         this.close();
         this._done();
         return data2;
@@ -1314,6 +1420,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         this.password.value = "";
         this.username.disabled = false;
         this.password.disabled = false;
+        this.persist.disabled = false;
         this.button.disabled = false;
       });
     }
@@ -1466,6 +1573,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 							<input id="password" name="password" type="password" autocomplete="current-password">
 						</div>
 						<br>
+						<label style="display: block; margin-bottom: 0.75rem;">
+							<input type="checkbox" name="persist" style="width: 20px"> Stay Logged In
+						</label>
 						<button>Login</button>
 					</form>
 				</div>
@@ -1593,17 +1703,20 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @param {string} login Login username or email
      * @param {string} password Password for account
      * @param {string} spoke Override login spoke
-     * @param {string} twoFactor 2FA code
+     * @param {twoFactor?: string, expire?: string} opts 2FA code & expire date (YYYY-MM-DD)
      * @returns {Promise<any>} Session information returned from login request
      */
-    login(spoke, login, password, twoFactor) {
+    login(spoke, login, password, opts) {
+      const date = /* @__PURE__ */ new Date();
+      date.setFullYear(date.getFullYear() + 1);
       return fetch(`${this.api.url}login`, {
         method: "POST",
         body: formData(clean({
           realm: spoke.trim(),
           login: login.trim(),
           password: password.trim(),
-          secret: twoFactor,
+          secret: opts == null ? void 0 : opts.twoFactor,
+          expireAt: (opts == null ? void 0 : opts.expire) == null ? formatDate("YYYY-MM-DD", date) : opts == null ? void 0 : opts.expire,
           dateFormat: "ISO8601"
         }))
       }).then(async (resp) => {

package/dist/index.mjs

@@ -2,22 +2,22 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __defProp2 = Object.defineProperty;
-var __defNormalProp2 = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField2 = (obj, key, value) => __defNormalProp2(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defNormalProp2 = (obj, key, value2) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value: value2 }) : obj[key] = value2;
+var __publicField2 = (obj, key, value2) => __defNormalProp2(obj, typeof key !== "symbol" ? key + "" : key, value2);
 function clean(obj, undefinedOnly = false) {
   if (obj == null) throw new Error("Cannot clean a NULL value");
   if (Array.isArray(obj)) {
     obj = obj.filter((o) => o != null);
   } else {
-    Object.entries(obj).forEach(([key, value]) => {
-      if (undefinedOnly && value === void 0 || !undefinedOnly && value == null) delete obj[key];
+    Object.entries(obj).forEach(([key, value2]) => {
+      if (undefinedOnly && value2 === void 0 || !undefinedOnly && value2 == null) delete obj[key];
     });
   }
   return obj;
 }
 function formData(target) {
   const data = new FormData();
-  Object.entries(target).forEach(([key, value]) => data.append(key, value));
+  Object.entries(target).forEach(([key, value2]) => data.append(key, value2));
   return data;
 }
 function JSONAttemptParse(json) {
@@ -28,19 +28,14 @@ function JSONAttemptParse(json) {
   }
 }
 function JSONSanitize(obj, space) {
-  let cache = [];
-  return JSON.stringify(obj, (key, value) => {
-    if (typeof value === "object" && value !== null) {
-      if (cache.includes(value)) return;
-      cache.push(value);
-    }
-    return value;
+  return JSON.stringify(obj, (key, value2) => {
+    return value2;
   }, space);
 }
 class PromiseProgress extends Promise {
   constructor(executor) {
     super((resolve, reject) => executor(
-      (value) => resolve(value),
+      (value2) => resolve(value2),
       (reason) => reject(reason),
       (progress) => this.progress = progress
     ));
@@ -50,10 +45,10 @@ class PromiseProgress extends Promise {
   get progress() {
     return this._progress;
   }
-  set progress(p) {
-    if (p == this._progress) return;
-    this._progress = p;
-    this.listeners.forEach((l) => l(p));
+  set progress(p2) {
+    if (p2 == this._progress) return;
+    this._progress = p2;
+    this.listeners.forEach((l) => l(p2));
   }
   static from(promise) {
     if (promise instanceof PromiseProgress) return promise;
@@ -61,7 +56,7 @@ class PromiseProgress extends Promise {
   }
   from(promise) {
     const newPromise = PromiseProgress.from(promise);
-    this.onProgress((p) => newPromise.progress = p);
+    this.onProgress((p2) => newPromise.progress = p2);
     return newPromise;
   }
   onProgress(callback) {
@@ -463,6 +458,106 @@ const _Logger = class _Logger2 extends TypedEmitter {
   }
 };
 __publicField2(_Logger, "LOG_LEVEL", 4);
+function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(), tz) {
+  const timezones = [
+    ["IDLW", -12],
+    ["SST", -11],
+    ["HST", -10],
+    ["AKST", -9],
+    ["PST", -8],
+    ["MST", -7],
+    ["CST", -6],
+    ["EST", -5],
+    ["AST", -4],
+    ["BRT", -3],
+    ["MAT", -2],
+    ["AZOT", -1],
+    ["UTC", 0],
+    ["CET", 1],
+    ["EET", 2],
+    ["MSK", 3],
+    ["AST", 4],
+    ["PKT", 5],
+    ["IST", 5.5],
+    ["BST", 6],
+    ["ICT", 7],
+    ["CST", 8],
+    ["JST", 9],
+    ["AEST", 10],
+    ["SBT", 11],
+    ["FJT", 12],
+    ["TOT", 13],
+    ["LINT", 14]
+  ];
+  function adjustTz(date2, gmt) {
+    const currentOffset = date2.getTimezoneOffset();
+    const adjustedOffset = gmt * 60;
+    return new Date(date2.getTime() + (adjustedOffset + currentOffset) * 6e4);
+  }
+  function day(num) {
+    return ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"][num] || "Unknown";
+  }
+  function doy(date2) {
+    const start = /* @__PURE__ */ new Date(`${date2.getFullYear()}-01-01 0:00:00`);
+    return Math.ceil((date2.getTime() - start.getTime()) / (1e3 * 60 * 60 * 24));
+  }
+  function month(num) {
+    return ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][num] || "Unknown";
+  }
+  function suffix(num) {
+    if (num % 100 >= 11 && num % 100 <= 13) return `${num}th`;
+    switch (num % 10) {
+      case 1:
+        return `${num}st`;
+      case 2:
+        return `${num}nd`;
+      case 3:
+        return `${num}rd`;
+      default:
+        return `${num}th`;
+    }
+  }
+  function tzOffset(offset) {
+    const hours = ~~(offset / 60);
+    const minutes = offset % 60;
+    return (offset > 0 ? "-" : "") + `${hours}:${minutes.toString().padStart(2, "0")}`;
+  }
+  if (typeof date == "number" || typeof date == "string") date = new Date(date);
+  let t;
+  if (tz == null) tz = -(date.getTimezoneOffset() / 60);
+  t = timezones.find((t2) => isNaN(tz) ? t2[0] == tz : t2[1] == tz);
+  if (!t) throw new Error(`Unknown timezone: ${tz}`);
+  date = adjustTz(date, t[1]);
+  const tokens = {
+    "YYYY": date.getFullYear().toString(),
+    "YY": date.getFullYear().toString().slice(2),
+    "MMMM": month(date.getMonth()),
+    "MMM": month(date.getMonth()).slice(0, 3),
+    "MM": (date.getMonth() + 1).toString().padStart(2, "0"),
+    "M": (date.getMonth() + 1).toString(),
+    "DDD": doy(date).toString(),
+    "DD": date.getDate().toString().padStart(2, "0"),
+    "Do": suffix(date.getDate()),
+    "D": date.getDate().toString(),
+    "dddd": day(date.getDay()),
+    "ddd": day(date.getDay()).slice(0, 3),
+    "HH": date.getHours().toString().padStart(2, "0"),
+    "H": date.getHours().toString(),
+    "hh": (date.getHours() % 12 || 12).toString().padStart(2, "0"),
+    "h": (date.getHours() % 12 || 12).toString(),
+    "mm": date.getMinutes().toString().padStart(2, "0"),
+    "m": date.getMinutes().toString(),
+    "ss": date.getSeconds().toString().padStart(2, "0"),
+    "s": date.getSeconds().toString(),
+    "SSS": date.getMilliseconds().toString().padStart(3, "0"),
+    "A": date.getHours() >= 12 ? "PM" : "AM",
+    "a": date.getHours() >= 12 ? "pm" : "am",
+    "ZZ": tzOffset(t[1] * 60).replace(":", ""),
+    "Z": tzOffset(t[1] * 60),
+    "z": typeof tz == "string" ? tz : t[0]
+  };
+  return format.replace(/YYYY|YY|MMMM|MMM|MM|M|DDD|DD|Do|D|dddd|ddd|HH|H|hh|h|mm|m|ss|s|SSS|A|a|ZZ|Z|z/g, (token) => tokens[token]);
+}
 function sleep(ms) {
   return new Promise((res) => setTimeout(res, ms));
 }
@@ -1264,6 +1359,7 @@ const _LoginPrompt = class _LoginPrompt {
     __publicField(this, "button");
     __publicField(this, "form");
     __publicField(this, "password");
+    __publicField(this, "persist");
     __publicField(this, "username");
     __publicField(this, "_done");
     /** Promise which resolves once login is complete */
@@ -1278,7 +1374,11 @@ const _LoginPrompt = class _LoginPrompt {
     this.alert = document.querySelector("#datalynk-login-alert");
     this.button = document.querySelector("#datalynk-login-form button");
     this.form = document.querySelector("#datalynk-login-form");
-    this.password = document.querySelector('#datalynk-login-form input[name="password"]'), this.username = document.querySelector('#datalynk-login-form input[name="username"]'), this.form.onsubmit = (event) => this.login(event);
+    this.password = document.querySelector('#datalynk-login-form input[name="password"]');
+    this.persist = document.querySelector('#datalynk-login-form input[name="persist"]');
+    this.username = document.querySelector('#datalynk-login-form input[name="username"]');
+    this.form.onsubmit = (event) => this.login(event);
+    if (options.persist === false) this.persist.parentElement.style.display = "none";
   }
   /**
    * Close the login prompt
@@ -1299,8 +1399,14 @@ const _LoginPrompt = class _LoginPrompt {
     this.alert.classList.add("hidden");
     this.username.disabled = true;
     this.password.disabled = true;
+    this.persist.disabled = true;
     this.button.disabled = true;
-    return this.api.auth.login(this.spoke, data.get("username"), data.get("password")).then((data2) => {
+    return this.api.auth.login(
+      this.spoke,
+      data.get("username"),
+      data.get("password"),
+      { expire: this.persist.checked ? null : void 0 }
+    ).then((data2) => {
       this.close();
       this._done();
       return data2;
@@ -1310,6 +1416,7 @@ const _LoginPrompt = class _LoginPrompt {
       this.password.value = "";
       this.username.disabled = false;
       this.password.disabled = false;
+      this.persist.disabled = false;
       this.button.disabled = false;
     });
   }
@@ -1462,6 +1569,9 @@ __publicField(_LoginPrompt, "template", (title = "Datalynk") => `
 							<input id="password" name="password" type="password" autocomplete="current-password">
 						</div>
 						<br>
+						<label style="display: block; margin-bottom: 0.75rem;">
+							<input type="checkbox" name="persist" style="width: 20px"> Stay Logged In
+						</label>
 						<button>Login</button>
 					</form>
 				</div>
@@ -1589,17 +1699,20 @@ class Auth {
    * @param {string} login Login username or email
    * @param {string} password Password for account
    * @param {string} spoke Override login spoke
-   * @param {string} twoFactor 2FA code
+   * @param {twoFactor?: string, expire?: string} opts 2FA code & expire date (YYYY-MM-DD)
    * @returns {Promise<any>} Session information returned from login request
    */
-  login(spoke, login, password, twoFactor) {
+  login(spoke, login, password, opts) {
+    const date = /* @__PURE__ */ new Date();
+    date.setFullYear(date.getFullYear() + 1);
     return fetch(`${this.api.url}login`, {
       method: "POST",
       body: formData(clean({
         realm: spoke.trim(),
         login: login.trim(),
         password: password.trim(),
-        secret: twoFactor,
+        secret: opts == null ? void 0 : opts.twoFactor,
+        expireAt: (opts == null ? void 0 : opts.expire) == null ? formatDate("YYYY-MM-DD", date) : opts == null ? void 0 : opts.expire,
         dateFormat: "ISO8601"
       }))
     }).then(async (resp) => {

package/dist/login-prompt.d.ts

@@ -6,6 +6,8 @@ export type LoginPromptOptions = {
     background?: string;
     /** Foreground color hex: `#000000` */
     color?: string;
+    /** Allow users to stay logged in */
+    persist?: boolean;
     /** Header, could be a simple string: 'Datalynk' or HTML: `<img src="...">`*/
     title?: string;
     /** Text color of header, only valid when passing a string to title */
@@ -24,6 +26,7 @@ export declare class LoginPrompt {
     private readonly button;
     private readonly form;
     private readonly password;
+    private readonly persist;
     private readonly username;
     private _done;
     /** Promise which resolves once login is complete */

package/dist/login-prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login-prompt.d.ts","sourceRoot":"","sources":["../src/login-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,uCAAuC;AACvC,MAAM,MAAM,kBAAkB,GAAG;IAChC,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sCAAsC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,6EAA6E;IAC7E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,4BAA4B;AAC5B,qBAAa,WAAW;IAwLX,OAAO,CAAC,QAAQ,CAAC,GAAG;aAAuB,KAAK,EAAE,MAAM;IAAS,OAAO,EAAE,kBAAkB;IAvLxG,mCAAmC;IACnC,OAAO,CAAC,MAAM,CAAC,GAAG,CA4HR;IAEV,8BAA8B;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CA2CrB;IAEF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAO;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAO;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAO;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAO;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAO;IAEhC,OAAO,CAAC,KAAK,CAAY;IACzB,oDAAoD;IACpD,IAAI,gBAAmD;gBAE1B,GAAG,EAAE,GAAG,EAAkB,KAAK,EAAE,MAAM,EAAS,OAAO,GAAE,kBAAuB;IAa7G;;OAEG;IACH,KAAK;IAKL,0CAA0C;IAC1C,MAAM;IAIN,8BAA8B;IAC9B,KAAK,CAAC,KAAK,EAAE,GAAG;CAqBhB"}
+{"version":3,"file":"login-prompt.d.ts","sourceRoot":"","sources":["../src/login-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,uCAAuC;AACvC,MAAM,MAAM,kBAAkB,GAAG;IAChC,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sCAAsC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,4BAA4B;AAC5B,qBAAa,WAAW;IA4LX,OAAO,CAAC,QAAQ,CAAC,GAAG;aAAuB,KAAK,EAAE,MAAM;IAAS,OAAO,EAAE,kBAAkB;IA3LxG,mCAAmC;IACnC,OAAO,CAAC,MAAM,CAAC,GAAG,CA4HR;IAEV,8BAA8B;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CA8CrB;IAEF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAO;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAO;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAO;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAO;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAO;IAC/B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAO;IAEhC,OAAO,CAAC,KAAK,CAAY;IACzB,oDAAoD;IACpD,IAAI,gBAAmD;gBAE1B,GAAG,EAAE,GAAG,EAAkB,KAAK,EAAE,MAAM,EAAS,OAAO,GAAE,kBAAuB;IAgB7G;;OAEG;IACH,KAAK;IAKL,0CAA0C;IAC1C,MAAM;IAIN,8BAA8B;IAC9B,KAAK,CAAC,KAAK,EAAE,GAAG;CA4BhB"}

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@auxilium/datalynk-client",
 	"description": "Datalynk client library",
 	"repository": "https://gitlab.auxiliumgroup.com/auxilium/datalynk/datalynk-client",
-	"version": "0.9.0",
+	"version": "0.9.1",
 	"author": "Zak Timson <zaktimson@gmail.com>",
 	"private": false,
 	"main": "./dist/index.cjs",
@@ -25,7 +25,8 @@
 		"watch": "vite build --watch"
 	},
 	"dependencies": {
-		"@ztimson/utils": "0.21.6",
+		"@ztimson/node-utils": "^1.0.0",
+		"@ztimson/utils": "0.23.8",
 		"rxjs": "^7.8.1"
 	},
 	"devDependencies": {