npm - @cnc_cbz/usefultools-plugin-official - Versions diffs - 1.0.4 → 1.0.5 - Mend

@cnc_cbz/usefultools-plugin-official 1.0.4 → 1.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/dist/js-runner.mjs +68 -94
package/package.json +1 -1

package/dist/js-runner.mjs CHANGED Viewed

@@ -39573,108 +39573,82 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     }
+    function serialize(v2, depth = 0) {
+      var _a3, _b2;
+      if (v2 === null) return { t: "null", p: "null" };
+      if (v2 === void 0) return { t: "undefined", p: "undefined" };
+      const tp2 = typeof v2;
+      if (tp2 === "string") return { t: "string", p: `"${v2}"` };
+      if (tp2 === "number" || tp2 === "boolean") return { t: tp2, p: String(v2) };
+      if (tp2 === "function") return { t: "function", p: `ƒ ${v2.name || "anonymous"}()` };
+      if (tp2 === "symbol") return { t: "symbol", p: v2.toString() };
+      if (v2 instanceof Error) return { t: "error", p: v2.stack || v2.message || String(v2) };
+      if (v2 instanceof Date) return { t: "date", p: v2.toISOString() };
+      if (v2 instanceof RegExp) return { t: "regexp", p: v2.toString() };
+      if (depth > 4) return { t: Array.isArray(v2) ? "array" : "object", p: Array.isArray(v2) ? "[...]" : "{...}" };
+      if (Array.isArray(v2)) {
+        const entries = [];
+        for (let i = 0; i < v2.length && i < 100; i++) entries.push({ k: String(i), v: serialize(v2[i], depth + 1) });
+        return { t: "array", p: `Array(${v2.length})`, e: entries };
+      }
+      if (tp2 === "object") {
+        const keys2 = Object.keys(v2);
+        const entries = [];
+        for (let i = 0; i < keys2.length && i < 50; i++) {
+          try {
+            entries.push({ k: keys2[i], v: serialize(v2[keys2[i]], depth + 1) });
+          } catch {
+            entries.push({ k: keys2[i], v: { t: "error", p: "<getter error>" } });
+          }
+        }
+        const name2 = ((_a3 = v2.constructor) == null ? void 0 : _a3.name) !== "Object" ? (_b2 = v2.constructor) == null ? void 0 : _b2.name : "";
+        let preview = name2 ? `${name2} {…}` : "{…}";
+        if (keys2.length <= 5) {
+          preview = (name2 ? `${name2} {` : "{") + keys2.slice(0, 5).map((k2) => `${k2}: …`).join(", ") + "}";
+        }
+        return { t: "object", p: preview, e: entries };
+      }
+      return { t: "string", p: String(v2) };
+    }
     async function runCode() {
       var _a3;
       if (running.value) return;
       running.value = true;
       logs.value = [];
       const userCode = ((_a3 = editorView.value) == null ? void 0 : _a3.state.doc.toString()) || "";
-      const urls = cdnUrls.value.filter((u) => u.trim());
-      const sandboxHtml = `
-<!DOCTYPE html><html><head>
-${urls.map((u) => `<script src="${u}"><\/script>`).join("\n")}
-</head><body><script>
-  // 递归序列化值为结构化树
-  function _ser(v, depth) {
-    if (depth === undefined) depth = 0;
-    if (v === null) return { t: 'null', p: 'null' };
-    if (v === undefined) return { t: 'undefined', p: 'undefined' };
-    var tp = typeof v;
-    if (tp === 'string') return { t: 'string', p: '"' + v + '"' };
-    if (tp === 'number' || tp === 'boolean') return { t: tp, p: String(v) };
-    if (tp === 'function') return { t: 'function', p: 'ƒ ' + (v.name || 'anonymous') + '()' };
-    if (tp === 'symbol') return { t: 'symbol', p: v.toString() };
-    if (v instanceof Error) return { t: 'error', p: v.stack || v.message || String(v) };
-    if (v instanceof Date) return { t: 'date', p: v.toISOString() };
-    if (v instanceof RegExp) return { t: 'regexp', p: v.toString() };
-    if (depth > 4) return { t: typeof v === 'object' ? (Array.isArray(v) ? 'array' : 'object') : tp, p: Array.isArray(v) ? '[...]' : '{...}' };
-    if (Array.isArray(v)) {
-      var entries = [];
-      for (var i = 0; i < v.length && i < 100; i++) entries.push({ k: String(i), v: _ser(v[i], depth + 1) });
-      return { t: 'array', p: 'Array(' + v.length + ')', e: entries };
-    }
-    if (tp === 'object') {
-      var keys = Object.keys(v), entries = [];
-      for (var i = 0; i < keys.length && i < 50; i++) {
-        try { entries.push({ k: keys[i], v: _ser(v[keys[i]], depth + 1) }); } catch(e) { entries.push({ k: keys[i], v: { t: 'error', p: '<getter error>' } }); }
-      }
-      var name = v.constructor && v.constructor.name !== 'Object' ? v.constructor.name : '';
-      var preview = name ? name + ' {…}' : '{…}';
-      if (keys.length <= 5) {
-        preview = name ? name + ' {' : '{';
-        preview += keys.slice(0, 5).map(function(k) { return k + ': …' }).join(', ');
-        preview += '}';
-      }
-      return { t: 'object', p: preview, e: entries };
-    }
-    return { t: 'string', p: String(v) };
-  }
-  const _post = (type, args) => {
-    window.parent.postMessage({ __jsRunner: true, type, args: args.map(a => _ser(a)) }, '*');
-  };
-  console.log = (...a) => _post('log', a);
-  console.warn = (...a) => _post('warn', a);
-  console.error = (...a) => _post('error', a);
-  console.info = (...a) => _post('info', a);
-  window.onerror = (msg, src, line, col, err) => {
-    _post('error', [err || msg]);
-  };
-  window.onunhandledrejection = (e) => {
-    _post('error', [e.reason || 'Unhandled Promise Rejection']);
-  };
-  try {
-    ${userCode}
-  } catch(e) {
-    _post('error', [e]);
-  }
-  window.parent.postMessage({ __jsRunner: true, type: '__done' }, '*');
-<\/script></body></html>`;
-      const handler = (e) => {
-        var _a4;
-        if ((_a4 = e.data) == null ? void 0 : _a4.__jsRunner) {
-          if (e.data.type === "__done") {
-            running.value = false;
-            window.removeEventListener("message", handler);
-            iframe == null ? void 0 : iframe.remove();
-            return;
-          }
-          logs.value.push({
-            type: e.data.type,
-            args: e.data.args || [],
-            timestamp: now()
-          });
-          scrollToBottom();
-        }
+      const pushLog = (type, ...args) => {
+        logs.value.push({ type, args: args.map((a3) => serialize(a3)), timestamp: now() });
+        scrollToBottom();
       };
-      window.addEventListener("message", handler);
-      const iframe = document.createElement("iframe");
-      iframe.style.display = "none";
-      iframe.setAttribute("sandbox", "allow-scripts");
-      document.body.appendChild(iframe);
-      iframe.srcdoc = sandboxHtml;
-      setTimeout(() => {
-        if (running.value) {
-          running.value = false;
-          window.removeEventListener("message", handler);
-          iframe == null ? void 0 : iframe.remove();
-          logs.value.push({ type: "error", args: [{ t: "error", p: "⏱ 执行超时（10秒）" }], timestamp: now() });
-          scrollToBottom();
+      const sandboxConsole = {
+        log: (...a3) => pushLog("log", ...a3),
+        warn: (...a3) => pushLog("warn", ...a3),
+        error: (...a3) => pushLog("error", ...a3),
+        info: (...a3) => pushLog("info", ...a3)
+      };
+      let timer = null;
+      let timedOut = false;
+      try {
+        const timeoutPromise = new Promise((_2, reject) => {
+          timer = setTimeout(() => {
+            timedOut = true;
+            reject(new Error("⏱ 执行超时（10秒）"));
+          }, 1e4);
+        });
+        const AsyncFunction = Object.getPrototypeOf(async function() {
+        }).constructor;
+        const fn2 = new AsyncFunction("console", userCode);
+        await Promise.race([fn2(sandboxConsole), timeoutPromise]);
+      } catch (e) {
+        if (timedOut) {
+          pushLog("error", "⏱ 执行超时（10秒）");
+        } else {
+          pushLog("error", e);
         }
-      }, 1e4);
+      } finally {
+        if (timer) clearTimeout(timer);
+        running.value = false;
+      }
     }
     const logStyles = {
       log: "text-gray-200",

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@cnc_cbz/usefultools-plugin-official",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "type": "module",
   "description": "UsefulTools 官方工具插件包",
   "keywords": [