@sv443-network/coreutils 2.0.1 → 2.0.3

package/dist/CoreUtils.mjs

@@ -478,16 +478,18 @@ var DataStore = class {
     this.engine = typeof opts.engine === "function" ? opts.engine() : opts.engine;
     this.options = opts;
     if (typeof opts.compressionFormat === "undefined")
-      opts.compressionFormat = ((_a = opts.encodeData) == null ? void 0 : _a[0]) ?? "deflate-raw";
+      this.compressionFormat = opts.compressionFormat = ((_a = opts.encodeData) == null ? void 0 : _a[0]) ?? "deflate-raw";
     if (typeof opts.compressionFormat === "string") {
       this.encodeData = [opts.compressionFormat, async (data) => await compress(data, opts.compressionFormat, "string")];
       this.decodeData = [opts.compressionFormat, async (data) => await compress(data, opts.compressionFormat, "string")];
     } else if ("encodeData" in opts && "decodeData" in opts && Array.isArray(opts.encodeData) && Array.isArray(opts.decodeData)) {
       this.encodeData = [opts.encodeData[0], opts.encodeData[1]];
       this.decodeData = [opts.decodeData[0], opts.decodeData[1]];
+      this.compressionFormat = opts.encodeData[0] ?? null;
     } else if (opts.compressionFormat === null) {
       this.encodeData = void 0;
       this.decodeData = void 0;
+      this.compressionFormat = null;
     } else
       throw new TypeError("Either `compressionFormat` or `encodeData` and `decodeData` have to be set and valid, but not all three at a time. Please refer to the documentation for more info.");
     this.engine.setDataStoreOptions(opts);
@@ -530,12 +532,13 @@ var DataStore = class {
         await this.migrateId(this.migrateIds);
         this.migrateIds = [];
       }
-      const storedData = await this.engine.getValue(`__ds-${this.id}-dat`, JSON.stringify(this.defaultData));
+      const storedDataRaw = await this.engine.getValue(`__ds-${this.id}-dat`, null);
       let storedFmtVer = Number(await this.engine.getValue(`__ds-${this.id}-ver`, NaN));
-      if (typeof storedData !== "string") {
+      if (typeof storedDataRaw !== "string") {
         await this.saveDefaultData();
         return { ...this.defaultData };
       }
+      const storedData = storedDataRaw ?? JSON.stringify(this.defaultData);
       const encodingFmt = String(await this.engine.getValue(`__ds-${this.id}-enf`, null));
       const isEncoded = encodingFmt !== "null" && encodingFmt !== "false";
       let saveData = false;
@@ -740,7 +743,8 @@ var BrowserStorageEngine = class extends DataStoreEngine {
   //#region storage api
   /** Fetches a value from persistent storage */
   async getValue(name, defaultValue) {
-    return (this.options.type === "localStorage" ? globalThis.localStorage.getItem(name) : globalThis.sessionStorage.getItem(name)) ?? defaultValue;
+    const val = this.options.type === "localStorage" ? globalThis.localStorage.getItem(name) : globalThis.sessionStorage.getItem(name);
+    return typeof val === "undefined" ? defaultValue : val;
   }
   /** Sets a value in persistent storage */
   async setValue(name, value) {
@@ -760,6 +764,7 @@ var BrowserStorageEngine = class extends DataStoreEngine {
 var fs;
 var FileStorageEngine = class extends DataStoreEngine {
   options;
+  fileAccessQueue = Promise.resolve();
   /**
    * Creates an instance of `FileStorageEngine`.  
    *   
@@ -813,27 +818,41 @@ var FileStorageEngine = class extends DataStoreEngine {
     if (!data)
       return defaultValue;
     const value = data == null ? void 0 : data[name];
-    if (value === void 0)
+    if (typeof value === "undefined")
       return defaultValue;
     if (typeof value === "string")
       return value;
-    return String(value ?? defaultValue);
+    return value;
   }
   /** Sets a value in persistent storage */
   async setValue(name, value) {
-    let data = await this.readFile();
-    if (!data)
-      data = {};
-    data[name] = value;
-    await this.writeFile(data);
+    this.fileAccessQueue = this.fileAccessQueue.then(async () => {
+      let data = await this.readFile();
+      if (!data)
+        data = {};
+      data[name] = value;
+      await this.writeFile(data);
+    }).catch((err) => {
+      console.error("Error in setValue:", err);
+      throw err;
+    });
+    await this.fileAccessQueue.catch(() => {
+    });
   }
   /** Deletes a value from persistent storage */
   async deleteValue(name) {
-    const data = await this.readFile();
-    if (!data)
-      return;
-    delete data[name];
-    await this.writeFile(data);
+    this.fileAccessQueue = this.fileAccessQueue.then(async () => {
+      const data = await this.readFile();
+      if (!data)
+        return;
+      delete data[name];
+      await this.writeFile(data);
+    }).catch((err) => {
+      console.error("Error in deleteValue:", err);
+      throw err;
+    });
+    await this.fileAccessQueue.catch(() => {
+    });
   }
   /** Deletes the file that contains the data of this DataStore. */
   async deleteStorage() {
@@ -1066,11 +1085,11 @@ var NanoEmitter = class {
   once(event, cb) {
     return new Promise((resolve) => {
       let unsub;
-      const onceProxy = (...args) => {
+      const onceProxy = ((...args) => {
         cb == null ? void 0 : cb(...args);
         unsub == null ? void 0 : unsub();
         resolve(args);
-      };
+      });
       unsub = this.events.on(event, onceProxy);
       this.eventUnsubscribes.push(unsub);
     });
@@ -1124,12 +1143,12 @@ var NanoEmitter = class {
         this.eventUnsubscribes = this.eventUnsubscribes.filter((u) => !curEvtUnsubs.includes(u));
       };
       for (const event of oneOf) {
-        const unsub = this.events.on(event, (...args) => {
+        const unsub = this.events.on(event, ((...args) => {
           checkUnsubAllEvt();
           callback(event, ...args);
           if (once)
             checkUnsubAllEvt(true);
-        });
+        }));
         curEvtUnsubs.push(unsub);
       }
       const allOfEmitted = /* @__PURE__ */ new Set();
@@ -1143,10 +1162,10 @@ var NanoEmitter = class {
         }
       };
       for (const event of allOf) {
-        const unsub = this.events.on(event, (...args) => {
+        const unsub = this.events.on(event, ((...args) => {
           checkUnsubAllEvt();
           checkAllOf(event, ...args);
-        });
+        }));
         curEvtUnsubs.push(unsub);
       }
       if (oneOf.length === 0 && allOf.length === 0)
@@ -1278,7 +1297,7 @@ var Debouncer = class extends NanoEmitter {
 function debounce(fn, timeout = 200, type = "immediate") {
   const debouncer = new Debouncer(timeout, type);
   debouncer.addListener(fn);
-  const func = (...args) => debouncer.call(...args);
+  const func = ((...args) => debouncer.call(...args));
   func.debouncer = debouncer;
   return func;
 }