@ztimson/utils 0.25.23 → 0.25.24

package/dist/database.d.ts

@@ -6,10 +6,13 @@ export type TableOptions = {
 export declare class Database {
     readonly database: string;
     version?: number | undefined;
+    private schemaLock;
+    private upgrading;
     connection: Promise<IDBDatabase>;
-    ready: boolean;
     tables: TableOptions[];
+    get ready(): boolean;
     constructor(database: string, tables?: (string | TableOptions)[], version?: number | undefined);
+    waitForUpgrade: () => Promise<void>;
     createTable<K extends IDBValidKey = any, T = any>(table: string | TableOptions): Promise<Table<K, T>>;
     deleteTable(table: string | TableOptions): Promise<void>;
     includes(name: any): boolean;

package/dist/index.cjs

@@ -396,11 +396,179 @@ ${opts.message || this.desc}`;
   function makeArray(value) {
     return Array.isArray(value) ? value : [value];
   }
+  function adjustedInterval(cb, ms) {
+    let cancel = false, timeout = null;
+    const p = async () => {
+      if (cancel) return;
+      const start = (/* @__PURE__ */ new Date()).getTime();
+      await cb();
+      const end = (/* @__PURE__ */ new Date()).getTime();
+      timeout = setTimeout(() => p(), ms - (end - start) || 1);
+    };
+    p();
+    return () => {
+      cancel = true;
+      if (timeout) clearTimeout(timeout);
+    };
+  }
+  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 == null) 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 instantInterval(fn2, interval) {
+    fn2();
+    return setInterval(fn2, interval);
+  }
+  function sleep(ms) {
+    return new Promise((res) => setTimeout(res, ms));
+  }
+  async function sleepWhile(fn2, checkInterval = 100) {
+    while (await fn2()) await sleep(checkInterval);
+  }
+  function timeUntil(date) {
+    return (date instanceof Date ? date.getTime() : date) - (/* @__PURE__ */ new Date()).getTime();
+  }
+  function timezoneOffset(tz, date = /* @__PURE__ */ new Date()) {
+    const dtf = new Intl.DateTimeFormat("en-US", {
+      timeZone: tz,
+      hour12: false,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit"
+    });
+    const parts = dtf.formatToParts(date);
+    const get = (type) => {
+      var _a;
+      return Number((_a = parts.find((v) => v.type === type)) == null ? void 0 : _a.value);
+    };
+    const y = get("year");
+    const mo = get("month");
+    const d = get("day");
+    const h = get("hour");
+    const m = get("minute");
+    const s = get("second");
+    const asUTC = Date.UTC(y, mo - 1, d, h, m, s);
+    const asLocal = date.getTime();
+    return Math.round((asLocal - asUTC) / 6e4);
+  }
+  class AsyncLock {
+    constructor() {
+      __publicField(this, "p", Promise.resolve());
+    }
+    run(fn2) {
+      const res = this.p.then(fn2, fn2);
+      this.p = res.then(() => {
+      }, () => {
+      });
+      return res;
+    }
+  }
   class Database {
     constructor(database, tables, version) {
+      __publicField(this, "schemaLock", new AsyncLock());
+      __publicField(this, "upgrading", false);
       __publicField(this, "connection");
-      __publicField(this, "ready", false);
       __publicField(this, "tables");
+      __publicField(this, "waitForUpgrade", () => sleepWhile(() => this.upgrading));
       this.database = database;
       this.version = version;
       this.connection = new Promise((resolve, reject) => {
@@ -427,9 +595,10 @@ ${opts.message || this.desc}`;
             this.version = db.version;
             resolve(db);
           }
-          this.ready = true;
+          this.upgrading = false;
         };
         req.onupgradeneeded = () => {
+          this.upgrading = true;
           const db = req.result;
           const existingTables = new ASet(Array.from(db.objectStoreNames));
           if (tables) {
@@ -446,21 +615,30 @@ ${opts.message || this.desc}`;
         };
       });
     }
+    get ready() {
+      return !this.upgrading;
+    }
     async createTable(table) {
-      if (typeof table == "string") table = { name: table };
-      const conn = await this.connection;
-      if (!this.includes(table.name)) {
-        conn.close();
-        Object.assign(this, new Database(this.database, [...this.tables, table], (this.version ?? 0) + 1));
-      }
-      return this.table(table.name);
+      return this.schemaLock.run(async () => {
+        if (typeof table == "string") table = { name: table };
+        const conn = await this.connection;
+        if (!this.includes(table.name)) {
+          conn.close();
+          Object.assign(this, new Database(this.database, [...this.tables, table], (this.version ?? 0) + 1));
+          await this.connection;
+        }
+        return this.table(table.name);
+      });
     }
     async deleteTable(table) {
-      if (typeof table == "string") table = { name: table };
-      if (!this.includes(table.name)) return;
-      const conn = await this.connection;
-      conn.close();
-      Object.assign(this, new Database(this.database, this.tables.filter((t) => t.name != table.name), (this.version ?? 0) + 1));
+      return this.schemaLock.run(async () => {
+        if (typeof table == "string") table = { name: table };
+        if (!this.includes(table.name)) return;
+        const conn = await this.connection;
+        conn.close();
+        Object.assign(this, new Database(this.database, this.tables.filter((t) => t.name != table.name), (this.version ?? 0) + 1));
+        await this.connection;
+      });
     }
     includes(name) {
       return !!this.tables.find((t) => t.name == (typeof name == "object" ? name.name : name.toString()));
@@ -483,6 +661,7 @@ ${opts.message || this.desc}`;
       });
     }
     async tx(table, fn2, readonly = false) {
+      await this.database.waitForUpgrade();
       const db = await this.database.connection;
       const tx = db.transaction(table, readonly ? "readonly" : "readwrite");
       const store = tx.objectStore(table);
@@ -997,160 +1176,6 @@ ${opts.message || this.desc}`;
       return this.from(super.finally(res));
     }
   }
-  function adjustedInterval(cb, ms) {
-    let cancel = false, timeout = null;
-    const p = async () => {
-      if (cancel) return;
-      const start = (/* @__PURE__ */ new Date()).getTime();
-      await cb();
-      const end = (/* @__PURE__ */ new Date()).getTime();
-      timeout = setTimeout(() => p(), ms - (end - start) || 1);
-    };
-    p();
-    return () => {
-      cancel = true;
-      if (timeout) clearTimeout(timeout);
-    };
-  }
-  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 == null) 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 instantInterval(fn2, interval) {
-    fn2();
-    return setInterval(fn2, interval);
-  }
-  function sleep(ms) {
-    return new Promise((res) => setTimeout(res, ms));
-  }
-  async function sleepWhile(fn2, checkInterval = 100) {
-    while (await fn2()) await sleep(checkInterval);
-  }
-  function timeUntil(date) {
-    return (date instanceof Date ? date.getTime() : date) - (/* @__PURE__ */ new Date()).getTime();
-  }
-  function timezoneOffset(tz, date = /* @__PURE__ */ new Date()) {
-    const dtf = new Intl.DateTimeFormat("en-US", {
-      timeZone: tz,
-      hour12: false,
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit",
-      hour: "2-digit",
-      minute: "2-digit",
-      second: "2-digit"
-    });
-    const parts = dtf.formatToParts(date);
-    const get = (type) => {
-      var _a;
-      return Number((_a = parts.find((v) => v.type === type)) == null ? void 0 : _a.value);
-    };
-    const y = get("year");
-    const mo = get("month");
-    const d = get("day");
-    const h = get("hour");
-    const m = get("minute");
-    const s = get("second");
-    const asUTC = Date.UTC(y, mo - 1, d, h, m, s);
-    const asLocal = date.getTime();
-    return Math.round((asLocal - asUTC) / 6e4);
-  }
   function downloadFile(blob, name) {
     if (!(blob instanceof Blob)) blob = new Blob(makeArray(blob));
     const url = URL.createObjectURL(blob);