edgeone 1.0.6 → 1.0.8

package/edgeone-dist/cli.js

@@ -103190,7 +103190,7 @@ var yargs_default = Yargs;
 // package.json
 var package_default = {
   name: "edgeone",
-  version: "1.0.6",
+  version: "1.0.8",
   description: "Command-line interface for TencentCloud Pages Functions",
   bin: {
     edgeone: "./edgeone-bin/edgeone.js"
@@ -106746,7 +106746,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";
@@ -106782,6 +106782,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),
       {
@@ -112942,6 +112943,13 @@ function isSource(v) {
   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 isDestination(v) {
   var _a6;
@@ -112962,6 +112970,13 @@ function isDestination(v) {
   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) {
@@ -113503,6 +113518,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 = /^\/(?:[^/]+\/)*\[\[(.+?)\]\]$/;
@@ -113545,6 +113561,7 @@ var BuildFunctionGenerator = class {
   env;
   logicText;
   bundleText;
+  cssText;
   functionList;
   functionIndex;
   constructor(props) {
@@ -113552,6 +113569,7 @@ var BuildFunctionGenerator = class {
     this.env = props.env;
     this.logicText = "";
     this.bundleText = "";
+    this.cssText = "";
     this.functionList = [];
     this.functionIndex = 0;
     if (!props.env) {
@@ -113569,9 +113587,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){
@@ -113695,7 +113735,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}`);
@@ -113733,7 +113773,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);
@@ -113799,19 +113839,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) {
@@ -114402,7 +114453,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.6",
+  "version": "1.0.8",
   "description": "Command-line interface for TencentCloud Pages Functions",
   "bin": {
     "edgeone": "./edgeone-bin/edgeone.js"