usf-cli 1.1.3 → 1.2.2

package/utils/uploader/index.js

@@ -1,359 +1,364 @@
-import { makeFile, loader } from "../function-construct/index.js";
-import os from "os";
-import fs from "fs";
-import path from "path";
-import JSZip from "jszip";
-import axios from "axios";
-import COS from "cos-nodejs-sdk-v5";
-
-const igonreList = [
-  ".DS_Store",
-  ".idea",
-  ".vscode",
-  ".git",
-  "package-lock.json",
-  ".uos_test",
-];
-let hasPackageJson = false;
-let hasNodeModules = false;
-
-const recordAuthInfoToFile = async function (id, secret) {
-  const tempDir = os.tmpdir();
-  const auth = { id: id, secret: secret };
-  try {
-    const file = await makeFile(tempDir, ".uos", "auth.json", true);
-    fs.writeFile(file, JSON.stringify(auth, null, 2), (err) => {
-      if (err) {
-        console.error(`Fail to record auth info.`);
-        return;
-      }
-      console.log(
-        `Auth info is recorded.\n\nIf stateless functions are completed, you can run "usf-cli -u" to upload them to UOS platform with UOS auth and deploy automatically.`
-      );
-    });
-  } catch (e) {
-    console.log(e);
-  }
-};
-
-const getAuthInfoFromFile = async function () {
-  const tempDir = os.tmpdir();
-  const authPath = path.join(tempDir, ".uos", "auth.json");
-  const authInfo = await loader(authPath);
-
-  return authInfo;
-};
-
-const convertToValidVariableName = function (folderName) {
-  // 移除非法字符并确保以合法字符开头
-  let validName = folderName.replace(/[^a-zA-Z0-9_$]/g, "_");
-  if (/^[0-9_$]/.test(validName)) {
-    validName = "_" + validName; // 如果以数字、下划线或美元符号开头，则添加下划线作为前缀
-  }
-  return validName;
-};
-
-const formatHandler = function (name, entry) {
-  return `const { main: ${name} } = require("./${entry}/index.js");\n\nexports.${name}_handler = ${name};\n\n`;
-};
-
-const zipDirectory = async function (entries, zip, dir, level = 0) {
-  const files = fs.readdirSync(dir);
-
-  for (const file of files) {
-    const filePath = path.join(dir, file);
-    const stats = fs.statSync(filePath);
-    if (igonreList.includes(file)) {
-      continue;
-    }
-    if (level === 0 && file === "package.json") {
-      hasPackageJson = true;
-    }
-    if (level === 0 && file === "node_modules") {
-      hasNodeModules = true;
-    }
-    if (stats.isDirectory()) {
-      const isEntry = await zipDirectory(
-        entries,
-        zip.folder(file),
-        filePath,
-        level + 1
-      );
-      if (isEntry) {
-        entries[file] = convertToValidVariableName(file);
-      }
-    } else {
-      const content = fs.readFileSync(filePath);
-      zip.file(file, content);
-    }
-  }
-  return level === 1 && files.includes("index.js");
-};
-
-const creatZip = async function (dir) {
-  const zip = new JSZip();
-  const entries = {};
-
-  dir = dir || process.cwd();
-
-  await zipDirectory(entries, zip, dir);
-  let entryFile = "";
-  for (let entry in entries) {
-    entryFile += formatHandler(entries[entry], entry);
-  }
-  zip.file(path.relative(dir, "index.js"), entryFile);
-  const zipContent = await zip.generateAsync({ type: "nodebuffer" });
-
-  return { entries, zipContent };
-};
-
-const getToken = async function (auth) {
-  const res = await axios.get(
-    "https://func.unity.cn/v1/func-stateless/functions/" +
-      auth.id +
-      "/get-transfer-token",
-    {
-      headers: {
-        Authorization: "Basic " + btoa(auth.id + ":" + auth.secret),
-      },
-    }
-  );
-  return res.data;
-};
-
-const uploadZipToCos = function (cosToken, zipContent) {
-  const cos = new COS({
-    getAuthorization: function (options, callback) {
-      callback({
-        TmpSecretId: cosToken.tmpSecretId,
-        TmpSecretKey: cosToken.tmpSecretKey,
-        SecurityToken: cosToken.token,
-        StartTime: cosToken.startTime,
-        ExpiredTime: Math.ceil(Date.parse(cosToken.expiredTime) / 1000),
-      });
-    },
-  });
-  let taskId;
-  return new Promise((resolve, reject) => {
-    cos.putObject(
-      {
-        Bucket: cosToken.bucket,
-        Region: cosToken.region,
-        Key: cosToken.objectName + `/${path.basename(process.cwd())}.zip`,
-        Body: zipContent,
-        onTaskReady: function (taskId) {
-          taskId = taskId;
-        },
-      },
-      function (err, data) {
-        if (err) {
-          reject(err);
-        } else {
-          taskId = null;
-          setTimeout(() => {
-            resolve();
-          }, 500);
-        }
-      }
-    );
-  });
-};
-
-const createScf = async function (auth, entries) {
-  let payLoad = {
-    scfList: [],
-  };
-
-  for (let entry in entries) {
-    payLoad.scfList.push({
-      name: entries[entry],
-      zipName: path.basename(process.cwd()),
-      handler: `index.${entries[entry]}_handler`,
-    });
-  }
-
-  await axios.post(
-    "https://func.unity.cn/v1/func-stateless/functions/" + auth.id + "/scf",
-    payLoad,
-    {
-      headers: {
-        Authorization: "Basic " + btoa(auth.id + ":" + auth.secret),
-      },
-    }
-  );
-};
-
-const loadingAnimation = function (loadingLabel) {
-  const frames = ["-", "\\", "|", "/"];
-  let i = 0;
-
-  const interval = setInterval(() => {
-    process.stdout.write(`\r${frames[i]} ${loadingLabel}...`);
-    i = (i + 1) % frames.length;
-  }, 100);
-
-  return interval;
-};
-
-const checkFunctionStatus = function (auth) {
-  return new Promise((resolve, reject) => {
-    const getFunctionInfo = async () => {
-      try {
-        const res = await axios.get(
-          "https://func.unity.cn/v1/func-stateless/functions/" + auth.id,
-          {
-            headers: {
-              Authorization: "Basic " + btoa(auth.id + ":" + auth.secret),
-            },
-          }
-        );
-
-        if (res?.data?.functionInfo?.status === "createFailed") {
-          reject();
-        } else if (res?.data?.functionInfo?.status === "creating") {
-          setTimeout(getFunctionInfo, 3000);
-        } else {
-          resolve(res?.data?.functionInfo);
-        }
-      } catch (e) {
-        reject(e);
-      }
-    };
-    getFunctionInfo();
-  });
-};
-
-const updateInstallDependency = async function (install = false, auth) {
-  let payload = {
-    functionInfo: {
-      options: {
-        installDependency: install ? "TRUE" : "FALSE",
-      },
-    },
-  };
-
-  await axios.put(
-    "https://func.unity.cn/v1/func-stateless/functions/" + auth.id,
-    payload,
-    {
-      headers: {
-        Authorization: "Basic " + btoa(auth.id + ":" + auth.secret),
-      },
-    }
-  );
-};
-
-const stepWrapper = async function (stepHandler, args, loading, done) {
-  let id = loadingAnimation(loading);
-  try {
-    const res = await stepHandler(...args);
-    clearInterval(id);
-    console.log(`\r>>> Success to ${done}!`);
-    return res;
-  } catch (e) {
-    clearInterval(id);
-    console.error(`\r>>> Failed to ${done}: \n`, e.response || e);
-    process.exit(1);
-  }
-};
-
-const listFunctions = async function (version, auth) {
-  try {
-    const params = {
-      version: version,
-    };
-    const res = await axios.get(
-      `https://func.unity.cn/v1/func-stateless/functions/${auth.id}/scf`,
-      {
-        params: params,
-        headers: {
-          Authorization: "Basic " + btoa(auth.id + ":" + auth.secret),
-        },
-      }
-    );
-    const scfs = res.data.scfs || [];
-    console.log(
-        `\n====== Successfully deployed ${scfs.length} function(s). Current Online Func version is: ${version} ======\n`
-    );
-
-    for (const scf of scfs) {
-      console.log(`Function Name: ${scf.name}\nFunction URL: ${scf.url}\n`);
-    }
-    console.log(`============ Deployment completed ============\n`);
-  } catch (error) {
-    console.log(error.response);
-  }
-};
-
-const deployFunctionsToPlatform = async function (dir, auth, install = false) {
-  hasNodeModules = false;
-  hasPackageJson = false;
-
-  console.log(`\n============ Deployment starts  ============\n`);
-
-  const { entries, zipContent } = await stepWrapper(
-    creatZip,
-    [dir],
-    "Packaging current project",
-    "package current project"
-  );
-
-  if (!hasNodeModules && !hasPackageJson) {
-    console.error("!!! Can't find package.json & node_modules/ in your project.");
-    process.exit(1);
-  }
-
-  if (hasNodeModules ^ hasPackageJson) {
-    install = hasPackageJson;
-  }
-
-  await stepWrapper(
-    updateInstallDependency,
-    [install, auth],
-    `Changing 'Online Install Dependency' status to ${
-      install ? "TRUE" : "FALSE"
-    }`,
-    `change 'Online Install Dependency' status to ${install ? "TRUE" : "FALSE"}`
-  );
-
-  if (install) {
-    igonreList.push("node_modules");
-  }
-
-  // const zipFilePath = path.join(process.cwd(), `/${path.basename(process.cwd())}.zip`);
-  // fs.writeFileSync(zipFilePath, zipContent);
-
-  const cosToken = await stepWrapper(
-    getToken,
-    [auth],
-    "Getting cos token",
-    "get cos token"
-  );
-
-  await stepWrapper(
-    uploadZipToCos,
-    [cosToken, zipContent],
-    "Uploading function project to cos",
-    "upload function project to cos"
-  );
-
-  await stepWrapper(
-    createScf,
-    [auth, entries],
-    "Updating Func Stateless",
-    "update Func Stateless"
-  );
-
-  const functionInfo = await stepWrapper(
-    checkFunctionStatus,
-    [auth],
-    "Deploying functions",
-    "deploy functions"
-  );
-
-  if (functionInfo.currentVersion) {
-    await listFunctions(functionInfo.currentVersion, auth);
-  }
-};
-
-export { recordAuthInfoToFile, getAuthInfoFromFile, deployFunctionsToPlatform };
+import { makeFile, loader } from "../function-construct/index.js";
+import os from "os";
+import fs from "fs";
+import path from "path";
+import JSZip from "jszip";
+import axios from "axios";
+import COS from "cos-nodejs-sdk-v5";
+
+const igonreList = [
+  ".DS_Store",
+  ".idea",
+  ".vscode",
+  ".git",
+  "package-lock.json",
+  ".uos_test",
+];
+let hasPackageJson = false;
+let hasNodeModules = false;
+
+const recordAuthInfoToFile = async function (id, secret) {
+  const tempDir = os.tmpdir();
+  const auth = { id: id, secret: secret };
+  try {
+    const file = await makeFile(tempDir, ".uos", "auth.json", true);
+    fs.writeFile(file, JSON.stringify(auth, null, 2), (err) => {
+      if (err) {
+        console.error(`Fail to record auth info.`);
+        return;
+      }
+      console.log(
+        `Auth info is recorded.\n\nIf stateless functions are completed, you can run "usf-cli -u" to upload them to UOS platform with UOS auth and deploy automatically.`
+      );
+    });
+  } catch (e) {
+    console.log(e);
+  }
+};
+
+const getAuthInfoFromFile = async function () {
+  const tempDir = os.tmpdir();
+  const authPath = path.join(tempDir, ".uos", "auth.json");
+  const authInfo = await loader(authPath);
+
+  return authInfo;
+};
+
+const convertToValidVariableName = function (folderName) {
+  // 移除非法字符并确保以合法字符开头
+  let validName = folderName.replace(/[^a-zA-Z0-9_$]/g, "_");
+  if (/^[0-9_$]/.test(validName)) {
+    validName = "_" + validName; // 如果以数字、下划线或美元符号开头，则添加下划线作为前缀
+  }
+  return validName;
+};
+
+const formatHandler = function (name, entry) {
+  return `const { main: ${name} } = require("./${entry}/index.js");\n\nexports.${name}_handler = ${name};\n\n`;
+};
+
+const zipDirectory = async function (entries, zip, dir, level = 0) {
+  const files = fs.readdirSync(dir);
+
+  for (const file of files) {
+    const filePath = path.join(dir, file);
+    const stats = fs.statSync(filePath);
+    if (igonreList.includes(file)) {
+      continue;
+    }
+    if (level === 0 && file === "package.json") {
+      hasPackageJson = true;
+    }
+    if (level === 0 && file === "node_modules") {
+      hasNodeModules = true;
+    }
+    if (stats.isDirectory()) {
+      const isEntry = await zipDirectory(
+        entries,
+        zip.folder(file),
+        filePath,
+        level + 1
+      );
+      if (isEntry) {
+        entries[file] = convertToValidVariableName(file);
+      }
+    } else {
+      const content = fs.readFileSync(filePath);
+      zip.file(file, content);
+    }
+  }
+  return level === 1 && files.includes("index.js");
+};
+
+const creatZip = async function (dir) {
+  const zip = new JSZip();
+  const entries = {};
+
+  dir = dir || process.cwd();
+
+  await zipDirectory(entries, zip, dir);
+  let entryFile = "";
+  for (let entry in entries) {
+    entryFile += formatHandler(entries[entry], entry);
+  }
+  zip.file(`index.js`, entryFile);
+  const zipContent = await zip.generateAsync({ type: "nodebuffer" });
+
+  return { entries, zipContent };
+};
+
+const getToken = async function (auth) {
+  const res = await axios.get(
+    "https://func.unity.cn/v1/func-stateless/functions/" +
+      auth.id +
+      "/get-transfer-token",
+    {
+      headers: {
+        Authorization: "Basic " + btoa(auth.id + ":" + auth.secret),
+      },
+    }
+  );
+  return res.data;
+};
+
+const uploadZipToCos = function (cosToken, zipContent) {
+  const cos = new COS({
+    getAuthorization: function (options, callback) {
+      callback({
+        TmpSecretId: cosToken.tmpSecretId,
+        TmpSecretKey: cosToken.tmpSecretKey,
+        SecurityToken: cosToken.token,
+        StartTime: cosToken.startTime,
+        ExpiredTime: Math.ceil(Date.parse(cosToken.expiredTime) / 1000),
+      });
+    },
+  });
+  let taskId;
+  return new Promise((resolve, reject) => {
+    cos.putObject(
+      {
+        Bucket: cosToken.bucket,
+        Region: cosToken.region,
+        Key: cosToken.objectName + `/${path.basename(process.cwd())}.zip`,
+        Body: zipContent,
+        onTaskReady: function (taskId) {
+          taskId = taskId;
+        },
+      },
+      function (err, data) {
+        if (err) {
+          reject(err);
+        } else {
+          taskId = null;
+          setTimeout(() => {
+            resolve();
+          }, 500);
+        }
+      }
+    );
+  });
+};
+
+const createScf = async function (auth, entries) {
+  let payLoad = {
+    scfList: [],
+  };
+
+  for (let entry in entries) {
+    payLoad.scfList.push({
+      name: entries[entry],
+      zipName: path.basename(process.cwd()),
+      handler: `index.${entries[entry]}_handler`,
+    });
+  }
+
+  await axios.post(
+    "https://func.unity.cn/v1/func-stateless/functions/" + auth.id + "/scf",
+    payLoad,
+    {
+      headers: {
+        Authorization: "Basic " + btoa(auth.id + ":" + auth.secret),
+      },
+    }
+  );
+};
+
+const loadingAnimation = function (loadingLabel) {
+  const frames = ["-", "\\", "|", "/"];
+  let i = 0;
+
+  const interval = setInterval(() => {
+    process.stdout.write(`\r${frames[i]} ${loadingLabel}...`);
+    i = (i + 1) % frames.length;
+  }, 100);
+
+  return interval;
+};
+
+const checkFunctionStatus = function (auth) {
+  return new Promise((resolve, reject) => {
+    const getFunctionInfo = async () => {
+      try {
+        const res = await axios.get(
+          "https://func.unity.cn/v1/func-stateless/functions/" + auth.id,
+          {
+            headers: {
+              Authorization: "Basic " + btoa(auth.id + ":" + auth.secret),
+            },
+          }
+        );
+
+        if (res?.data?.functionInfo?.status === "createFailed") {
+          reject('creating new version failed');
+        } else if (res?.data?.functionInfo?.status === "creating") {
+          setTimeout(getFunctionInfo, 3000);
+        } else {
+          resolve(res?.data?.functionInfo);
+        }
+      } catch (e) {
+        reject(e);
+      }
+    };
+    getFunctionInfo();
+  });
+};
+
+const updateInstallDependency = async function (install = false, auth) {
+  let payload = {
+    functionInfo: {
+      options: {
+        installDependency: install ? "TRUE" : "FALSE",
+      },
+    },
+  };
+
+  await axios.put(
+    "https://func.unity.cn/v1/func-stateless/functions/" + auth.id,
+    payload,
+    {
+      headers: {
+        Authorization: "Basic " + btoa(auth.id + ":" + auth.secret),
+      },
+    }
+  );
+};
+
+const stepWrapper = async function (stepHandler, args, loading, done) {
+  let id = loadingAnimation(loading);
+  try {
+    const res = await stepHandler(...args);
+    clearInterval(id);
+    console.log(`\r>>> Success to ${done}!`);
+    return res;
+  } catch (e) {
+    clearInterval(id);
+    console.error(`\r>>> Failed to ${done}: \n`, e?.response || e);
+    process.exit(1);
+  }
+};
+
+const listFunctions = async function (version, auth) {
+  try {
+    const params = {
+      version: version,
+    };
+    const res = await axios.get(
+      `https://func.unity.cn/v1/func-stateless/functions/${auth.id}/scf`,
+      {
+        params: params,
+        headers: {
+          Authorization: "Basic " + btoa(auth.id + ":" + auth.secret),
+        },
+      }
+    );
+    const scfs = res.data.scfs || [];
+    console.log(
+        `\n====== Successfully deployed ${scfs.length} function(s). Current Online Func version is: ${version} ======\n`
+    );
+
+    for (const scf of scfs) {
+      console.log(`Function Name: ${scf.name}\nFunction URL: ${scf.url}\n`);
+    }
+    console.log(`============ Deployment completed ============\n`);
+  } catch (error) {
+    console.log(error.response);
+  }
+};
+
+const deployFunctionsToPlatform = async function (dir, auth, install = false) {
+  hasNodeModules = false;
+  hasPackageJson = false;
+
+  console.log(`\n============ Deployment starts  ============\n`);
+
+  const { entries, zipContent } = await stepWrapper(
+    creatZip,
+    [dir],
+    "Packaging current project",
+    "package current project"
+  );
+
+  if (Object.keys(entries).length === 0) {
+    console.error("!!! Can't find function entry in your project.");
+    process.exit(1);
+  }
+
+  if (!hasNodeModules && !hasPackageJson) {
+    console.error("!!! Can't find package.json & node_modules/ in your project.");
+    process.exit(1);
+  }
+
+  if (hasNodeModules ^ hasPackageJson) {
+    install = hasPackageJson;
+  }
+
+  await stepWrapper(
+    updateInstallDependency,
+    [install, auth],
+    `Changing 'Online Install Dependency' status to ${
+      install ? "TRUE" : "FALSE"
+    }`,
+    `change 'Online Install Dependency' status to ${install ? "TRUE" : "FALSE"}`
+  );
+
+  if (install) {
+    igonreList.push("node_modules");
+  }
+
+  // const zipFilePath = path.join(process.cwd(), `/${path.basename(process.cwd())}.zip`);
+  // fs.writeFileSync(zipFilePath, zipContent);
+
+  const cosToken = await stepWrapper(
+    getToken,
+    [auth],
+    "Getting cos token",
+    "get cos token"
+  );
+
+  await stepWrapper(
+    uploadZipToCos,
+    [cosToken, zipContent],
+    "Uploading function project to cos",
+    "upload function project to cos"
+  );
+
+  await stepWrapper(
+    createScf,
+    [auth, entries],
+    "Updating Func Stateless",
+    "update Func Stateless"
+  );
+
+  const functionInfo = await stepWrapper(
+    checkFunctionStatus,
+    [auth],
+    "Deploying functions",
+    "deploy functions"
+  );
+
+  if (functionInfo.currentVersion) {
+    await listFunctions(functionInfo.currentVersion, auth);
+  }
+};
+
+export { recordAuthInfoToFile, getAuthInfoFromFile, deployFunctionsToPlatform };