@inweb/client 26.10.5 → 26.11.0

package/dist/client.js

@@ -251,6 +251,15 @@
         }
     }
 
+    function normalizeParam(param, separator = "|") {
+        if (typeof param === "string")
+            param = param.split(",");
+        if (Array.isArray(param))
+            param = param.filter((x) => x).join(separator);
+        if (typeof param === "string")
+            param = param.trim();
+        return param.toString();
+    }
     function delay(ms, signal) {
         return new Promise((resolve) => {
             let timeoutId = 0;
@@ -261,7 +270,7 @@
             timeoutId = window.setTimeout(() => {
                 signal.removeEventListener("abort", abortHandler);
                 resolve(false);
-            }, ms);
+            }, ms || 0);
             signal.addEventListener("abort", abortHandler, { once: true });
         });
     }
@@ -588,10 +597,7 @@
             if (name)
                 searchParams.set("name", name);
             if (ids) {
-                if (Array.isArray(ids))
-                    ids = ids.join("|");
-                if (typeof ids === "string")
-                    ids = ids.trim();
+                ids = normalizeParam(ids);
                 if (ids)
                     searchParams.set("id", ids);
             }
@@ -1753,7 +1759,7 @@
                 .then((filesInformation) => filesInformation.map((item) => item.file.reference))
                 .then((ids) => {
                 const files = new Endpoint("/files", this.httpClient, this.headers);
-                return files.get(`?id=${ids.join("|")}`);
+                return files.get(`?id=${normalizeParam(ids)}`);
             })
                 .then((response) => response.json())
                 .then((files) => files.result.map((data) => new File(data, this.httpClient)));
@@ -2235,7 +2241,7 @@
                 .then((data) => ({
                 ...data,
                 server: data.version,
-                client: "26.10.5",
+                client: "26.11.0",
             }));
         }
         registerUser(email, password, userName) {
@@ -2405,17 +2411,14 @@
             if (name)
                 searchParams.set("name", name);
             if (ext) {
-                if (Array.isArray(ext))
-                    ext = ext.join("|");
-                if (typeof ext === "string")
-                    ext = ext.toLowerCase();
+                ext = normalizeParam(ext);
                 if (ext)
-                    searchParams.set("ext", ext);
+                    searchParams.set("ext", ext.toLowerCase());
             }
             if (ids) {
-                if (Array.isArray(ids))
-                    ids = ids.join("|");
-                searchParams.set("id", ids);
+                ids = normalizeParam(ids);
+                if (ids)
+                    searchParams.set("id", ids);
             }
             if (sortByDesc !== undefined)
                 searchParams.set("sortBy", sortByDesc ? "desc" : "asc");
@@ -2484,12 +2487,9 @@
             if (limit > 0)
                 searchParams.set("limit", limit.toString());
             if (status) {
-                if (Array.isArray(status))
-                    status = status.join("|");
-                if (typeof status === "string")
-                    status = status.trim().toLowerCase();
+                status = normalizeParam(status);
                 if (status)
-                    searchParams.set("status", status);
+                    searchParams.set("status", status.toLowerCase());
             }
             if (sortByDesc !== undefined)
                 searchParams.set("sortBy", sortByDesc ? "desc" : "asc");
@@ -2534,10 +2534,7 @@
             if (name)
                 searchParams.set("name", name);
             if (ids) {
-                if (Array.isArray(ids))
-                    ids = ids.join("|");
-                if (typeof ids === "string")
-                    ids = ids.trim();
+                ids = normalizeParam(ids);
                 if (ids)
                     searchParams.set("id", ids);
             }
@@ -2591,10 +2588,7 @@
             if (name)
                 searchParams.set("name", name);
             if (ids) {
-                if (Array.isArray(ids))
-                    ids = ids.join("|");
-                if (typeof ids === "string")
-                    ids = ids.trim();
+                ids = normalizeParam(ids);
                 if (ids)
                     searchParams.set("id", ids);
             }
@@ -2731,7 +2725,7 @@
         }
     }
 
-    const version = "26.10.5";
+    const version = "26.11.0";
 
     exports.Assembly = Assembly;
     exports.ClashTest = ClashTest;
@@ -2750,6 +2744,8 @@
     exports.SharedFile = SharedFile;
     exports.SharedLink = SharedLink;
     exports.User = User;
+    exports.delay = delay;
+    exports.normalizeParam = normalizeParam;
     exports.parseArgs = parseArgs;
     exports.statusText = statusText;
     exports.userFullName = userFullName;