@dongdev/fca-unofficial 2.0.7 → 2.0.10

package/src/utils/request.js

@@ -1,10 +1,9 @@
-"use strict";
-
 const axios = require("axios");
 const { CookieJar } = require("tough-cookie");
 const { wrapper } = require("axios-cookiejar-support");
 const FormData = require("form-data");
 const { HttpsProxyAgent } = require("https-proxy-agent");
+const { Readable } = require("stream");
 
 const headersMod = require("./headers");
 const getHeaders = headersMod.getHeaders || headersMod;
@@ -50,6 +49,25 @@ function cfg(base = {}) {
   };
 }
 
+function toStringVal(v) {
+  if (v === undefined || v === null) return "";
+  if (typeof v === "bigint") return v.toString();
+  if (typeof v === "boolean") return v ? "true" : "false";
+  return String(v);
+}
+
+function isStream(v) {
+  return v && typeof v === "object" && typeof v.pipe === "function" && typeof v.on === "function";
+}
+
+function isBlobLike(v) {
+  return v && typeof v.arrayBuffer === "function" && (typeof v.type === "string" || typeof v.name === "string");
+}
+
+function isPairArrayList(arr) {
+  return Array.isArray(arr) && arr.length > 0 && arr.every(x => Array.isArray(x) && x.length === 2 && typeof x[0] === "string");
+}
+
 function cleanGet(url) {
   return requestWithRetry(() => client.get(url, cfg()));
 }
@@ -71,9 +89,19 @@ function post(url, reqJar, form, options, ctx, customHeader) {
     if (form && typeof form === "object") {
       for (const k of Object.keys(form)) {
         let v = form[k];
+        if (isPairArrayList(v)) {
+          for (const [kk, vv] of v) p.append(`${k}[${kk}]`, toStringVal(vv));
+          continue;
+        }
+        if (Array.isArray(v)) {
+          for (const x of v) {
+            if (Array.isArray(x) && x.length === 2 && typeof x[1] !== "object") p.append(k, toStringVal(x[1]));
+            else p.append(k, toStringVal(x));
+          }
+          continue;
+        }
         if (getType(v) === "Object") v = JSON.stringify(v);
-        if (Array.isArray(v)) v.forEach(x => p.append(k, x));
-        else p.append(k, v);
+        p.append(k, toStringVal(v));
       }
     }
     data = p.toString();
@@ -82,13 +110,53 @@ function post(url, reqJar, form, options, ctx, customHeader) {
   return requestWithRetry(() => client.post(url, data, cfg({ reqJar, headers })));
 }
 
-function postFormData(url, reqJar, form, qs, options, ctx) {
+async function postFormData(url, reqJar, form, qs, options, ctx) {
   const fd = new FormData();
   if (form && typeof form === "object") {
     for (const k of Object.keys(form)) {
       const v = form[k];
-      if (Array.isArray(v)) v.forEach(x => fd.append(k, x));
-      else fd.append(k, v);
+      if (v === undefined || v === null) continue;
+      if (isPairArrayList(v)) {
+        for (const [kk, vv] of v) fd.append(`${k}[${kk}]`, typeof vv === "object" && !Buffer.isBuffer(vv) && !isStream(vv) ? JSON.stringify(vv) : vv);
+        continue;
+      }
+      if (Array.isArray(v)) {
+        for (const x of v) {
+          if (Array.isArray(x) && x.length === 2 && x[1] && typeof x[1] === "object" && !Buffer.isBuffer(x[1]) && !isStream(x[1])) {
+            fd.append(k, x[0], x[1]);
+          } else if (Array.isArray(x) && x.length === 2 && typeof x[1] !== "object") {
+            fd.append(k, toStringVal(x[1]));
+          } else if (x && typeof x === "object" && "value" in x && "options" in x) {
+            fd.append(k, x.value, x.options || {});
+          } else if (isStream(x) || Buffer.isBuffer(x) || typeof x === "string") {
+            fd.append(k, x);
+          } else if (isBlobLike(x)) {
+            const buf = Buffer.from(await x.arrayBuffer());
+            fd.append(k, buf, { filename: x.name || k, contentType: x.type || undefined });
+          } else {
+            fd.append(k, JSON.stringify(x));
+          }
+        }
+        continue;
+      }
+      if (v && typeof v === "object" && "value" in v && "options" in v) {
+        fd.append(k, v.value, v.options || {});
+        continue;
+      }
+      if (isStream(v) || Buffer.isBuffer(v) || typeof v === "string") {
+        fd.append(k, v);
+        continue;
+      }
+      if (isBlobLike(v)) {
+        const buf = Buffer.from(await v.arrayBuffer());
+        fd.append(k, buf, { filename: v.name || k, contentType: v.type || undefined });
+        continue;
+      }
+      if (typeof v === "number" || typeof v === "boolean") {
+        fd.append(k, toStringVal(v));
+        continue;
+      }
+      fd.append(k, JSON.stringify(v));
     }
   }
   const headers = { ...getHeaders(url, options, ctx), ...fd.getHeaders() };

package/CHANGELOG.md

@@ -1,52 +0,0 @@
-# Changelog
-Too lazy to write changelog, sorry! (will write changelog in the next release, through.)
-## v1.0.10 - 2025-04-24
-- Hotfix / auto bump
-
-## v1.0.11 - 2025-04-24
-- Hotfix / auto bump
-
-## v1.0.12 - 2025-04-28
-- Hotfix / auto bump
-
-## v1.0.13 - 2025-04-28
-- Hotfix / auto bump
-
-## v1.0.14 - 2025-04-28
-- Hotfix / auto bump
-
-## v1.0.15 - 2025-05-03
-- Hotfix / auto bump
-
-## v1.0.16 - 2025-05-07
-- Hotfix / auto bump
-
-## v1.0.17 - 2025-05-07
-- Hotfix / auto bump
-
-## v1.0.18 - 2025-05-22
-- Hotfix / auto bump
-
-## v1.0.19 - 2025-05-23
-- Hotfix / auto bump
-
-## v2.0.0 - 2025-10-05
-- Hotfix / auto bump
-
-## v2.0.1 - 2025-10-05
-- Hotfix / auto bump
-
-## v2.0.2 - 2025-10-05
-- Hotfix / auto bump
-
-## v2.0.3 - 2025-10-05
-- Hotfix / auto bump
-
-## v2.0.4 - 2025-10-05
-- Hotfix / auto bump
-
-## v2.0.5 - 2025-10-06
-- Now you can turn on/off autoLogin in config file.
-- Added autoUpdate feature.
-## v2.0.6-beta - 2025-10-06
-- Hotfix / auto bump

package/LICENSE-MIT

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Avery, Benjamin, David, Maude
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

package/func/checkUpdate.js

@@ -1,58 +0,0 @@
-const logger = require("./logger");
-const fs = require("fs");
-const { exec } = require("child_process");
-const pkgName = "@dongdev/fca-unofficial";
-
-function execPromise(cmd) {
-  return new Promise((resolve, reject) => {
-    exec(cmd, (error, stdout, stderr) => {
-      if (error) return reject({ error, stderr });
-      resolve({ stdout, stderr });
-    });
-  });
-}
-
-function getInstalledVersion() {
-  try {
-    const p = require.resolve(`${pkgName}/package.json`, { paths: [process.cwd(), __dirname] });
-    return JSON.parse(fs.readFileSync(p, "utf8")).version;
-  } catch {
-    return null;
-  }
-}
-
-async function checkAndUpdateVersion(callback) {
-  try {
-    logger("Đang kiểm tra phiên bản...", "info");
-    const latest = (await execPromise(`npm view ${pkgName} version`)).stdout.trim();
-    const installed = getInstalledVersion();
-    if (!installed || installed !== latest) {
-      logger(`Đã có bản mới (${latest}) Phiên bản đang dùng (${installed || "chưa cài"}). Đang cập nhật...`, "info");
-      try {
-        const { stderr } = await execPromise(`npm i ${pkgName}@latest`);
-        if (stderr) logger(stderr, "error");
-        logger(`Đã cập nhật fca lên phiên bản mới nhất: ${latest}, khởi động lại để áp dụng.`, "info");
-        callback(null);
-      } catch (e) {
-        logger(`Lỗi khi chạy npm install: ${e.error || e}. Đang thử tải về từ Github...`, "error");
-        try {
-          const { stderr } = await execPromise("npm i https://github.com/DongDev-VN/fca-unofficial");
-          if (stderr) logger(stderr, "error");
-          logger(`Đã tải về từ Github thành công: ${latest}`, "info");
-          callback(null);
-        } catch (gitErr) {
-          logger(`Lỗi khi tải về từ Github: ${gitErr.error || gitErr}`, "error");
-          callback(gitErr.error || gitErr);
-        }
-      }
-    } else {
-      logger("Phiên bản đang dùng đã là mới nhất.", "info");
-      callback(null);
-    }
-  } catch (err) {
-    logger(`Lỗi khi kiểm tra phiên bản: ${err}`, "error");
-    callback(err);
-  }
-}
-
-module.exports.checkAndUpdateVersion = checkAndUpdateVersion;

package/func/logger.js

@@ -1,112 +0,0 @@
-const chalk = require("chalk");
-const gradient = require("gradient-string");
-const themes = [
-  "blue",
-  "dream2",
-  "dream",
-  "test",
-  "fiery",
-  "rainbow",
-  "pastel",
-  "cristal",
-  "red",
-  "aqua",
-  "pink",
-  "retro",
-  "sunlight",
-  "teen",
-  "summer",
-  "flower",
-  "ghost",
-  "hacker"
-];
-const theme = themes[Math.floor(Math.random() * themes.length)];
-let co;
-let error;
-if (theme.toLowerCase() === "blue") {
-  co = gradient([
-    { color: "#1affa3", pos: 0.2 },
-    { color: "cyan", pos: 0.4 },
-    { color: "pink", pos: 0.6 },
-    { color: "cyan", pos: 0.8 },
-    { color: "#1affa3", pos: 1 }
-  ]);
-  error = chalk.red.bold;
-} else if (theme == "dream2") {
-  cra = gradient("blue", "pink");
-  co = gradient("#a200ff", "#21b5ff", "#a200ff");
-} else if (theme.toLowerCase() === "dream") {
-  co = gradient([
-    { color: "blue", pos: 0.2 },
-    { color: "pink", pos: 0.3 },
-    { color: "gold", pos: 0.6 },
-    { color: "pink", pos: 0.8 },
-    { color: "blue", pos: 1 }
-  ]);
-  error = chalk.red.bold;
-} else if (theme.toLowerCase() === "fiery") {
-  co = gradient("#fc2803", "#fc6f03", "#fcba03");
-  error = chalk.red.bold;
-} else if (theme.toLowerCase() === "rainbow") {
-  co = gradient.rainbow;
-  error = chalk.red.bold;
-} else if (theme.toLowerCase() === "pastel") {
-  co = gradient.pastel;
-  error = chalk.red.bold;
-} else if (theme.toLowerCase() === "cristal") {
-  co = gradient.cristal;
-  error = chalk.red.bold;
-} else if (theme.toLowerCase() === "red") {
-  co = gradient("red", "orange");
-  error = chalk.red.bold;
-} else if (theme.toLowerCase() === "aqua") {
-  co = gradient("#0030ff", "#4e6cf2");
-  error = chalk.blueBright;
-} else if (theme.toLowerCase() === "pink") {
-  cra = gradient("purple", "pink");
-  co = gradient("#d94fff", "purple");
-} else if (theme.toLowerCase() === "retro") {
-  cra = gradient("#d94fff", "purple");
-  co = gradient.retro;
-} else if (theme.toLowerCase() === "sunlight") {
-  cra = gradient("#f5bd31", "#f5e131");
-  co = gradient("orange", "#ffff00", "#ffe600");
-} else if (theme.toLowerCase() === "teen") {
-  cra = gradient("#00a9c7", "#853858", "#853858", "#00a9c7");
-  co = gradient.teen;
-} else if (theme.toLowerCase() === "summer") {
-  cra = gradient("#fcff4d", "#4de1ff");
-  co = gradient.summer;
-} else if (theme.toLowerCase() === "flower") {
-  cra = gradient("blue", "purple", "yellow", "#81ff6e");
-  co = gradient.pastel;
-} else if (theme.toLowerCase() === "ghost") {
-  cra = gradient("#0a658a", "#0a7f8a", "#0db5aa");
-  co = gradient.mind;
-} else if (theme === "hacker") {
-  cra = chalk.hex("#4be813");
-  co = gradient("#47a127", "#0eed19", "#27f231");
-} else {
-  co = gradient("#243aff", "#4687f0", "#5800d4");
-  error = chalk.red.bold;
-}
-module.exports = (text, type) => {
-  switch (type) {
-    case "warn":
-      process.stderr.write(co(`\r[ FCA-WARN ] > ${text}`) + "\n");
-      break;
-    case "error":
-      process.stderr.write(
-        chalk.bold.hex("#ff0000").bold(`\r[ FCA-ERROR ]`) + ` > ${text}` + "\n"
-      );
-      break;
-    case "info":
-      process.stderr.write(chalk.bold(co(`\r[ FCA-UNO ] > ${text}`) + "\n"));
-      break;
-    default:
-      process.stderr.write(
-        chalk.bold(co(`\r${String(type).toUpperCase()} ${text}`) + "\n")
-      );
-      break;
-  }
-};