edgeone 1.0.7 → 1.0.9

package/edgeone-dist/cli.js

@@ -103299,7 +103299,7 @@ var yargs_default = Yargs;
 // package.json
 var package_default = {
   name: "edgeone",
-  version: "1.0.7",
+  version: "1.0.9",
   description: "Command-line interface for TencentCloud Pages Functions",
   bin: {
     edgeone: "./edgeone-bin/edgeone.js"
@@ -106855,7 +106855,7 @@ var {
 var cookie = __toESM(require_dist2());
 var getHost = async () => {
   const region = await getLoginRegion();
-  if (region === "ap-singapore") {
+  if (region === "global") {
     return "https://edgeone.tencentcloud.com/api/cli/proxy";
   }
   return "https://edgeone.cloud.tencent.com/api/cli/proxy";
@@ -106891,6 +106891,7 @@ async function capi(action, params, options, callback) {
   try {
     const res1 = await axios_default.post(
       // `https://siaas.cloud.tencent.com/cgi/capi?csrfCode=${await getCsrfCode()}`,
+      // `https://siaas.tencentcloud.com/cgi/capi?csrfCode=${await getCsrfCode()}`,
       await getHost(),
       JSON.stringify(data.body),
       {
@@ -111309,6 +111310,11 @@ var tefConfRewritesSchema = querySchema.merge(
     destination: z.string().superRefine(pathMatch)
   })
 ).array();
+var tefConfCachesSchema = querySchema.merge(
+  z.object({
+    cacheTtl: z.number()
+  })
+).array();
 var tefConfigSchema = z.object({
   // name: z.string(),
   // main: z.string(),
@@ -111324,7 +111330,8 @@ var tefConfigSchema = z.object({
   nodeVersion: z.string().optional().describe("the node version to use."),
   headers: tefConfHeadersSchema.optional(),
   redirects: tefConfRedirectsSchema.optional(),
-  rewrites: tefConfRewritesSchema.optional()
+  rewrites: tefConfRewritesSchema.optional(),
+  caches: tefConfCachesSchema.optional()
 });
 var filteredTefConfigSchema = toFilteredSchema(tefConfigSchema);
 var symFilteredSchema = Symbol("filteredSchema");
@@ -113053,8 +113060,12 @@ function isSource(v) {
   }
   if (v.length) {
     const arr = v.split("/");
-    const ret = arr.some((v2) => v2.includes(":") && (v2.includes("*") || v2.includes(".")));
-    if (ret) {
+    const ret1 = arr.some((v2) => v2.includes(":") && (v2.includes("*") || v2.includes(".")));
+    if (ret1) {
+      return Error_Message.char_match;
+    }
+    const ret2 = arr.some((v2) => v2.split(":").length > 2);
+    if (ret2) {
       return Error_Message.char_match;
     }
   }
@@ -113072,19 +113083,12 @@ function isDestination(v) {
   if (illegal.test(v)) {
     return Error_Message.char_match;
   }
-  if (((_a6 = v.match(/\*/g)) == null ? void 0 : _a6.length) > 1) {
+  if (((_a6 = v.match(/\*/g)) == null ? void 0 : _a6.length) >= 1) {
     return Error_Message.char_match;
   }
   if (/(?<![a-zA-Z0-9_\-/:*.~=?#!$&+,;%@ ]):/.test(v) || /:(?![a-zA-Z0-9]+)/.test(v)) {
     return Error_Message.char_match;
   }
-  if (v.length) {
-    const arr = v.split("/");
-    const ret = arr.some((v2) => v2.includes(":") && (v2.includes("*") || v2.includes(".")));
-    if (ret) {
-      return Error_Message.char_match;
-    }
-  }
 }
 function isKey(v) {
   if (v.length === 0) {
@@ -113113,6 +113117,17 @@ function isStatusCode(v) {
     return Error_Message.value_match;
   }
 }
+function isCacheTtl(v) {
+  if (typeof v !== "number") {
+    return Error_Message.value_match;
+  }
+  if (!Number.isInteger(v)) {
+    return Error_Message.value_match;
+  }
+  if (v < 0) {
+    return Error_Message.value_match;
+  }
+}
 function parseSubHeaders(config, path9) {
   const result = [];
   const message = [];
@@ -113380,8 +113395,72 @@ function parseRewrites(config, path9) {
   }
   return [result, message];
 }
+function parseCaches(config, path9) {
+  let result = [];
+  const message = [];
+  if (!isArray2(config)) {
+    message.push({
+      path: [...path9],
+      message: Error_Message.invalid_type
+    });
+    return [result, message];
+  }
+  for (const index in config) {
+    const cache = config[index];
+    if (!isObject2(cache)) {
+      message.push({
+        path: [...path9, `[${index}]`],
+        message: Error_Message.invalid_type
+      });
+      continue;
+    }
+    const { source, cacheTtl } = cache;
+    if (!isString2(source)) {
+      message.push({
+        path: [...path9, `[${index}]`, "source"],
+        message: Error_Message.invalid_type
+      });
+      continue;
+    }
+    const source_e = isSource(source);
+    if (source_e) {
+      message.push({
+        path: [...path9, `[${index}]`, "source"],
+        message: source_e
+      });
+      continue;
+    }
+    if (!isNumber2(cacheTtl)) {
+      message.push({
+        path: [...path9, `[${index}]`, "cacheTtl"],
+        message: Error_Message.invalid_type
+      });
+      continue;
+    }
+    const cacheTtl_e = isCacheTtl(cacheTtl);
+    if (cacheTtl_e) {
+      message.push({
+        path: [...path9, `[${index}]`, "cacheTtl"],
+        message: cacheTtl_e
+      });
+      continue;
+    }
+    result.push({
+      source,
+      cacheTtl
+    });
+  }
+  if (result.length > Max_Len) {
+    message.push({
+      path: [...path9],
+      message: Error_Message.max_length
+    });
+    result = result.slice(0, Max_Len);
+  }
+  return [result, message];
+}
 function parse2(config, path9) {
-  const result = { headers: [], redirects: [], rewrites: [] };
+  const result = { headers: [], redirects: [], rewrites: [], caches: [] };
   const message = [];
   if (!isObject2(config)) {
     message.push({
@@ -113390,20 +113469,22 @@ function parse2(config, path9) {
     });
     return [result, message];
   }
-  const { headers = [], redirects = [], rewrites = [] } = config;
+  const { headers = [], redirects = [], rewrites = [], caches = [] } = config;
   const [result_h, message_h] = parseHeaders(headers, [...path9, "headers"]);
   const [result_r, message_r] = parseRedirects(redirects, [...path9, "redirects"]);
   const [result_w, message_w] = parseRewrites(rewrites, [...path9, "rewrites"]);
+  const [result_c, message_c] = parseCaches(caches, [...path9, "caches"]);
   result.headers = result_h;
   result.redirects = result_r;
   result.rewrites = result_w;
+  result.caches = result_c;
   const rest_arg = ["outputDirectory", "installCommand", "buildCommand", "nodeVersion"];
   for (const key2 in config) {
     if (rest_arg.includes(key2) && config[key2]) {
       result[key2] = config[key2];
     }
   }
-  message.push(...message_h, ...message_r, ...message_w);
+  message.push(...message_h, ...message_r, ...message_w, ...message_c);
   return [result, message];
 }
 
@@ -113507,7 +113588,8 @@ async function safeParseTefConfig() {
   return {
     headers: [],
     redirects: [],
-    rewrites: []
+    rewrites: [],
+    caches: []
   };
   if (showError()) {
   }
@@ -113626,6 +113708,7 @@ var path5 = require("path");
 var esbuild = require("esbuild");
 var FUNCTIONPATH = "./functions";
 var OUTPUTPATH = "./.edgeone/functions/index.js";
+var CSSOUTPUTPATH = "./.edgeone/assets/index.css";
 var OUTPUTMETA = "./.edgeone/meta.json";
 var regex1 = /^\/(?:[^/]+\/)*\[(.+?)\]$/;
 var regex2 = /^\/(?:[^/]+\/)*\[\[(.+?)\]\]$/;
@@ -113668,6 +113751,7 @@ var BuildFunctionGenerator = class {
   env;
   logicText;
   bundleText;
+  cssText;
   functionList;
   functionIndex;
   constructor(props) {
@@ -113675,6 +113759,7 @@ var BuildFunctionGenerator = class {
     this.env = props.env;
     this.logicText = "";
     this.bundleText = "";
+    this.cssText = "";
     this.functionList = [];
     this.functionIndex = 0;
     if (!props.env) {
@@ -113692,9 +113777,31 @@ var BuildFunctionGenerator = class {
   }
   async init() {
     await this.readIndexFiles(FUNCTIONPATH);
+    if (this.cssText) {
+      writeFileSync(CSSOUTPUTPATH, this.cssText);
+    }
     if (this.logicText) {
       this.bundleText = `
       let global = globalThis;
+
+      class MessageChannel {
+        constructor() {
+          this.port1 = new MessagePort();
+          this.port2 = new MessagePort();
+        }
+      }
+      class MessagePort {
+        constructor() {
+          this.onmessage = null;
+        }
+        postMessage(data) {
+          if (this.onmessage) {
+            setTimeout(() => this.onmessage({ data }), 0);
+          }
+        }
+      }
+      global.MessageChannel = MessageChannel;
+
       let routeParams = {};
       let pagesFunctionResponse = null;
       async function handleRequest(context){
@@ -113818,7 +113925,7 @@ var BuildFunctionGenerator = class {
     let tempResult = stringMap.text;
     const onRequestRegex = /onRequest(?![a-zA-Z])/;
     if (onRequestRegex.test(tempResult)) {
-      tempResult = stringMap.text.replace(/\}\)\(\)\;\nresponseFoo/, `
+      tempResult = stringMap.text.replace(/\}\)\(\)\;\n(\/\*\!(.|\n)*\*\/\n)*responseFoo/, `
         pagesFunctionResponse = onRequest;
       })();`);
       const routeParams = this.matchPath(`${stringMap.path}`);
@@ -113856,7 +113963,7 @@ var BuildFunctionGenerator = class {
     }
     methodList.forEach((item) => {
       if (tempResult.indexOf(item.funcName) > -1) {
-        tempResult = stringMap.text.replace(/\}\)\(\)\;\nresponseFoo/, `
+        tempResult = stringMap.text.replace(/\}\)\(\)\;\n(\/\*\!(.|\n)*\*\/\n)*responseFoo/, `
           pagesFunctionResponse = ${item.funcName};
         })();`);
         const routeParams = this.matchPath(stringMap.path);
@@ -113922,19 +114029,30 @@ var BuildFunctionGenerator = class {
     const result = esbuild.buildSync({
       entryPoints: [filePath],
       bundle: true,
+      // minify: true,
       // minifyWhitespace: true,
-      write: false
+      // outdir: './.tef_dist/assets',
+      write: false,
       // 禁止写入文件
+      outfile: "./.tef_dist/assets.js"
     });
-    const regex = /\.(js|ts|cjs|tsx|jsx)$/;
-    const bundledCode = result.outputFiles[0].text;
-    filePath = filePath.replace(/\\/g, "/");
-    const extractedPath = filePath.replace(/\/index\.(js|ts|cjs|tsx|jsx)/, ".js").replace(regex, "").replace("functions", "");
-    return {
-      filePath: filePath.replace("functions/", ""),
-      path: extractedPath === "" ? "/" : extractedPath,
-      text: `${bundledCode}responseFoo`
-    };
+    let currentFileInfo;
+    for (let i3 = 0; i3 < result.outputFiles.length; i3++) {
+      if (result.outputFiles[i3].path.indexOf(".css") > -1) {
+        this.cssText += result.outputFiles[i3].text;
+      } else {
+        const regex = /\.(js|ts|cjs|tsx|jsx)$/;
+        const bundledCode = result.outputFiles[i3].text;
+        filePath = filePath.replace(/\\/g, "/");
+        const extractedPath = filePath.replace(/\/index\.(js|ts|cjs|tsx|jsx)/, ".js").replace(regex, "").replace("functions", "");
+        currentFileInfo = {
+          filePath: filePath.replace("functions/", ""),
+          path: extractedPath === "" ? "/" : extractedPath,
+          text: `${bundledCode}responseFoo`
+        };
+      }
+    }
+    return currentFileInfo;
   }
 };
 async function PagesBuild(props) {
@@ -114525,7 +114643,7 @@ var path6 = require("path");
 var chokidar = require("chokidar");
 var listenFileTypes = ["js", "json", "html", "css", "jsx", "ts", "tsx", "vue", "md", "cjs"];
 async function remoteDevServer(jscontent, projectId, metaJSON) {
-  const res = await pagesCapi("DescribeDebugFunction", {
+  const res = await pagesCapi("CreateDebugFunction", {
     JSContent: jscontent,
     ProjectId: projectId,
     MetaData: metaJSON

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edgeone",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Command-line interface for TencentCloud Pages Functions",
   "bin": {
     "edgeone": "./edgeone-bin/edgeone.js"