node-karin 1.8.0 → 1.8.3

package/dist/global.d.d.ts

@@ -17,52 +17,52 @@ declare const createDebug: (prefix: string) => {
     enable: (bool: boolean) => void;
 } & ((...args: any[]) => void);
 
-/* eslint-disable no-var */
-declare global {
-  var logger: Logger
-  var debug: ReturnType<typeof createDebug>
-  type EventEmitter = events.EventEmitter
-}
-
-declare global {
-  namespace NodeJS {
-    interface ProcessEnv {
-      /** 是否启用HTTP */
-      HTTP_ENABLE: string
-      /** HTTP监听端口 */
-      HTTP_PORT: string
-      /** HTTP监听地址 */
-      HTTP_HOST: string
-      /** HTTP鉴权秘钥 仅用于karin自身Api */
-      HTTP_AUTH_KEY: string
-      /** ws_server鉴权秘钥 */
-      WS_SERVER_AUTH_KEY: string
-      /** 是否启用Redis 关闭后将使用内部虚拟Redis */
-      REDIS_ENABLE: string
-      /** 重启是否调用pm2 如果不调用则会直接关机 此配置适合有进程守护的程序 */
-      PM2_RESTART: string
-      /** 日志等级 */
-      LOG_LEVEL: string
-      /** 日志保留天数 */
-      LOG_DAYS_TO_KEEP: string
-      /** 日志文件最大大小 如果此项大于0则启用日志分割 */
-      LOG_MAX_LOG_SIZE: string
-      /** logger.fnc颜色 */
-      LOG_FNC_COLOR: string
-      /** 运行器 "node" | "pm2" | "tsx" */
-      RUNTIME: 'node' | 'pm2' | 'tsx'
-      /** ffmpeg路径 */
-      FFMPEG_PATH: string
-      /** ffprobe路径 */
-      FFPROBE_PATH: string
-      /** ffplay路径 */
-      FFPLAY_PATH: string
-      /** node-karin版本 */
-      KARIN_VERSION: string
-      /** tsx监察者模式 */
-      TSX_WATCH: string
-      /** 日志实时Api最多支持同时连接数 */
-      LOG_MAX_CONNECTIONS: string
-    }
-  }
+/* eslint-disable no-var */
+declare global {
+  var logger: Logger
+  var debug: ReturnType<typeof createDebug>
+  type EventEmitter = events.EventEmitter
+}
+
+declare global {
+  namespace NodeJS {
+    interface ProcessEnv {
+      /** 是否启用HTTP */
+      HTTP_ENABLE: string
+      /** HTTP监听端口 */
+      HTTP_PORT: string
+      /** HTTP监听地址 */
+      HTTP_HOST: string
+      /** HTTP鉴权秘钥 仅用于karin自身Api */
+      HTTP_AUTH_KEY: string
+      /** ws_server鉴权秘钥 */
+      WS_SERVER_AUTH_KEY: string
+      /** 是否启用Redis 关闭后将使用内部虚拟Redis */
+      REDIS_ENABLE: string
+      /** 重启是否调用pm2 如果不调用则会直接关机 此配置适合有进程守护的程序 */
+      PM2_RESTART: string
+      /** 日志等级 */
+      LOG_LEVEL: string
+      /** 日志保留天数 */
+      LOG_DAYS_TO_KEEP: string
+      /** 日志文件最大大小 如果此项大于0则启用日志分割 */
+      LOG_MAX_LOG_SIZE: string
+      /** logger.fnc颜色 */
+      LOG_FNC_COLOR: string
+      /** 运行器 "node" | "pm2" | "tsx" */
+      RUNTIME: 'node' | 'pm2' | 'tsx'
+      /** ffmpeg路径 */
+      FFMPEG_PATH: string
+      /** ffprobe路径 */
+      FFPROBE_PATH: string
+      /** ffplay路径 */
+      FFPLAY_PATH: string
+      /** node-karin版本 */
+      KARIN_VERSION: string
+      /** tsx监察者模式 */
+      TSX_WATCH: string
+      /** 日志实时Api最多支持同时连接数 */
+      LOG_MAX_CONNECTIONS: string
+    }
+  }
 }

package/dist/index.mjs

@@ -27954,7 +27954,7 @@ var init_tool = __esm({
       }
       return true;
     };
-    spawnProcess = (command2, args, options = {}, emitLog) => {
+    spawnProcess = (command2, args, options = {}, emitLog, pnpm) => {
       return new Promise((resolve) => {
         const proc = spawn(command2, args, {
           shell: true,
@@ -27965,12 +27965,17 @@ var init_tool = __esm({
           }
         });
         proc.stdout.on("data", (data) => {
-          logger.debug(data.toString());
-          emitLog(data.toString());
+          const message2 = data.toString();
+          logger.debug(message2);
+          emitLog(message2);
         });
         proc.stderr.on("data", (data) => {
-          logger.debug(data.toString());
-          emitLog(data.toString());
+          const message2 = data.toString();
+          if (message2.includes("ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF")) {
+            pnpm && pnpm();
+          }
+          logger.debug(message2);
+          emitLog(message2);
         });
         proc.on("close", (code) => {
           proc.kill();
@@ -28206,12 +28211,18 @@ var init_installMarket = __esm({
         async (_2, emitLog) => {
           const args = ["add", data.target, "--save"];
           if (isWorkspace()) args.push("-w");
-          await spawnProcess(
-            "pnpm",
-            args,
-            {},
-            emitLog
-          );
+          let IS_ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF = false;
+          await spawnProcess("pnpm", args, {}, emitLog, () => {
+            IS_ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF = true;
+          });
+          if (IS_ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF) {
+            emitLog("\u68C0\u6D4B\u5230 ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF \u9519\u8BEF\uFF0C\u5C1D\u8BD5\u4FEE\u590D...");
+            emitLog("\u6267\u884C pnpm install -f \u5F3A\u5236\u91CD\u5EFA\u6A21\u5757\u76EE\u5F55");
+            await spawnProcess("pnpm", ["install", "-f"], {}, emitLog);
+            emitLog("\u6A21\u5757\u76EE\u5F55\u91CD\u5EFA\u5B8C\u6210\uFF0C\u91CD\u65B0\u5C1D\u8BD5\u5B89\u88C5\u63D2\u4EF6");
+            await spawnProcess("pnpm", args, {}, emitLog);
+            emitLog("\u5B89\u88C5\u5B8C\u6210\uFF0C\u5C1D\u8BD5\u52A0\u8F7D\u63D2\u4EF6");
+          }
           await pkgHotReload("npm", data.target);
           return true;
         }
@@ -28382,7 +28393,18 @@ var init_installCustom = __esm({
           const args = ["add", pkg2, "--save"];
           if (isWorkspace()) args.push("-w");
           if (data.registry) args.push(`--registry=${data.registry}`);
-          await spawnProcess("pnpm", args, {}, emitLog);
+          let IS_ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF = false;
+          await spawnProcess("pnpm", args, {}, emitLog, () => {
+            IS_ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF = true;
+          });
+          if (IS_ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF) {
+            emitLog("\u68C0\u6D4B\u5230 ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF \u9519\u8BEF\uFF0C\u5C1D\u8BD5\u4FEE\u590D...");
+            emitLog("\u6267\u884C pnpm install -f \u5F3A\u5236\u91CD\u5EFA\u6A21\u5757\u76EE\u5F55");
+            await spawnProcess("pnpm", ["install", "-f"], {}, emitLog);
+            emitLog("\u6A21\u5757\u76EE\u5F55\u91CD\u5EFA\u5B8C\u6210\uFF0C\u91CD\u65B0\u5C1D\u8BD5\u5B89\u88C5\u63D2\u4EF6");
+            await spawnProcess("pnpm", args, {}, emitLog);
+            emitLog("\u5B89\u88C5\u5B8C\u6210\uFF0C\u5C1D\u8BD5\u52A0\u8F7D\u63D2\u4EF6");
+          }
           await pkgHotReload("npm", data.target);
           return true;
         }

package/dist/web/assets/js/page-404.tsx-DuSCXxgV.js

@@ -0,0 +1 @@
+import{j as t}from"./vendor-react-BFjuLQyM.js";import{P as r}from"./components-CxadY39V.js";import"./vendor-others-BM6DakDu.js";import"./vendor-editor-B8hjWfkw.js";import"./vendor-ui-utils-5rYIvRjL.js";import"./vendor-heroui-CWZ6Mu45.js";import"./page-dashboard-DeOjlIBI.js";import"./hooks-DCwZcclx.js";import"./utils-qrmq67Xg.js";import"./vendor-visual-CzYP84zg.js";const x=()=>t.jsx("div",{className:"min-h-screen flex items-center justify-center",children:t.jsx(r,{})});export{x as default};

package/dist/web/assets/js/{utils-Cj3xTboC.js → utils-qrmq67Xg.js}

@@ -1,2 +1,2 @@
-import{V as p}from"./vendor-react-ChUmQ3I2.js";import{a5 as g}from"./components-Bp80gYJA.js";const k=async(t,n,e,r)=>{const{setIsLogModalOpen:i,setTaskId:c,setTaskLogs:o,setTaskName:f}=n;f("更新插件");const a=["开始创建更新任务...",`options: ${JSON.stringify(t)}`];o(a);try{const s=await g(t);if(s.success&&s.taskId)c(s.taskId),o([...a,`
+import{V as p}from"./vendor-react-BFjuLQyM.js";import{a5 as g}from"./components-CxadY39V.js";const k=async(t,n,e,r)=>{const{setIsLogModalOpen:i,setTaskId:c,setTaskLogs:o,setTaskName:f}=n;f("更新插件");const a=["开始创建更新任务...",`options: ${JSON.stringify(t)}`];o(a);try{const s=await g(t);if(s.success&&s.taskId)c(s.taskId),o([...a,`
 任务创建成功!`,`任务ID: ${s.taskId}`,"正在连接任务执行日志..."]),i(!0),typeof e=="function"&&e(),typeof r=="function"&&r();else throw new Error(s.message||"未知错误")}catch(s){console.error("更新失败:",s),p.error(`更新失败: ${s.message}`)}};export{k as c};

package/dist/web/grid.svg

@@ -1,6 +1,6 @@
-<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <pattern id="grid" width="10" height="10" patternUnits="userSpaceOnUse">
-    <path d="M 10 0 L 0 0 0 10" fill="none" stroke="currentColor" stroke-width="0.5"/>
-  </pattern>
-  <rect width="100" height="100" fill="url(#grid)"/>
+<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <pattern id="grid" width="10" height="10" patternUnits="userSpaceOnUse">
+    <path d="M 10 0 L 0 0 0 10" fill="none" stroke="currentColor" stroke-width="0.5"/>
+  </pattern>
+  <rect width="100" height="100" fill="url(#grid)"/>
 </svg> 

package/dist/web/icon.css

@@ -1,25 +1,25 @@
-/* https://fonts.googleapis.com/icon?family=Material+Icons */
-
-/* fallback */
-@font-face {
-  font-family: 'Material Icons';
-  font-style: normal;
-  font-weight: 400;
-  src: url(./flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
-}
-
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-feature-settings: 'liga';
-  -webkit-font-smoothing: antialiased;
+/* https://fonts.googleapis.com/icon?family=Material+Icons */
+
+/* fallback */
+@font-face {
+  font-family: 'Material Icons';
+  font-style: normal;
+  font-weight: 400;
+  src: url(./flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
+}
+
+.material-icons {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-feature-settings: 'liga';
+  -webkit-font-smoothing: antialiased;
 }

package/dist/web/index.html

@@ -1,38 +1,38 @@
-<!doctype html>
-<html lang="en">
-
-<head>
-  <meta charset="UTF-8" />
-  <link rel="icon" type="image/svg+xml" href="/web/karin.png" />
-  <link rel="stylesheet" href="/web/icon.css">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>KarinJS WebUI</title>
-  <meta key="title" content="Vite + NextUI" property="og:title" />
-  <meta content="Make beautiful websites regardless of your design experience." property="og:description" />
-  <meta content="Make beautiful websites regardless of your design experience." name="description" />
-  <meta key="viewport"
-    content="viewport-fit=cover, width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
-    name="viewport" />
-  <link href="/web/assets/ico/favicon-BoqZd694.ico" rel="icon" />
-  <script type="module" crossorigin src="/web/assets/js/entry-DhKjPdoJ.js"></script>
+<!doctype html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/web/karin.png" />
+  <link rel="stylesheet" href="/web/icon.css">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>KarinJS WebUI</title>
+  <meta key="title" content="Vite + NextUI" property="og:title" />
+  <meta content="Make beautiful websites regardless of your design experience." property="og:description" />
+  <meta content="Make beautiful websites regardless of your design experience." name="description" />
+  <meta key="viewport"
+    content="viewport-fit=cover, width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
+    name="viewport" />
+  <link href="/web/assets/ico/favicon-BoqZd694.ico" rel="icon" />
+  <script type="module" crossorigin src="/web/assets/js/entry-CHFt_H9g.js"></script>
   <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-editor-B8hjWfkw.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-others-Bv0hrdEA.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-others-BM6DakDu.js">
   <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-ui-utils-5rYIvRjL.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-react-ChUmQ3I2.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-heroui-CMeNhCFh.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/hooks-CSKAeqvP.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-visual-CdiJEXnN.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/components-Bp80gYJA.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/utils-Cj3xTboC.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/page-dashboard-B6B4ob8B.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-react-BFjuLQyM.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-heroui-CWZ6Mu45.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/hooks-DCwZcclx.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-visual-CzYP84zg.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/components-CxadY39V.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/utils-qrmq67Xg.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/page-dashboard-DeOjlIBI.js">
   <link rel="stylesheet" crossorigin href="/web/assets/css/vendor-editor-CFbL2ovg.css">
   <link rel="stylesheet" crossorigin href="/web/assets/css/vendor-others-ZgkIHsf0.css">
   <link rel="stylesheet" crossorigin href="/web/assets/css/components-ep7vm38G.css">
-  <link rel="stylesheet" crossorigin href="/web/assets/css/index-DxLRZkvi.css">
-</head>
-
-<body>
-  <div id="root"></div>
-</body>
-
+  <link rel="stylesheet" crossorigin href="/web/assets/css/index-BrG42AwU.css">
+</head>
+
+<body>
+  <div id="root"></div>
+</body>
+
 </html>