itismyskillmarket 1.3.37 → 1.3.39

package/electron/main.mjs

@@ -0,0 +1,214 @@
+/**
+ * =============================================================================
+ * SkillMarket - Electron Main Process
+ * =============================================================================
+ *
+ * 原生桌面应用窗口：
+ * - 内嵌 HTTP 服务器（非浏览器模式）
+ * - 系统托盘（关闭到托盘）
+ * - 原生菜单栏
+ * =============================================================================
+ */
+
+import { app, BrowserWindow, Tray, Menu, dialog, shell, nativeImage } from 'electron';
+import path from 'path';
+import { fileURLToPath, pathToFileURL } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const ROOT = path.resolve(__dirname, '..');
+
+let mainWindow = null;
+let tray = null;
+let server = null;
+const PORT = 18770;
+
+// 单实例锁
+const gotLock = app.requestSingleInstanceLock();
+if (!gotLock) {
+  app.quit();
+} else {
+  app.on('second-instance', () => {
+    if (mainWindow) {
+      if (mainWindow.isMinimized()) mainWindow.restore();
+      mainWindow.show();
+      mainWindow.focus();
+    }
+  });
+}
+
+// ---------------------------------------------------------------------------
+// 启动内嵌 HTTP 服务器
+// ---------------------------------------------------------------------------
+
+async function startServer(port) {
+  const entryPath = pathToFileURL(
+    path.join(ROOT, 'dist', 'electron-entry.js')
+  ).href;
+  const { startGuiServer } = await import(entryPath);
+
+  const srv = startGuiServer(port);
+  server = srv;
+
+  return new Promise((resolve, reject) => {
+    srv.on('listening', () => resolve(port));
+    srv.on('error', (err) => {
+      if (err.code === 'EADDRINUSE') {
+        srv.close();
+        resolve(startServer(port + 1));
+      } else {
+        reject(err);
+      }
+    });
+  });
+}
+
+// ---------------------------------------------------------------------------
+// 创建主窗口
+// ---------------------------------------------------------------------------
+
+function createWindow(port) {
+  mainWindow = new BrowserWindow({
+    width: 1200,
+    height: 800,
+    minWidth: 900,
+    minHeight: 600,
+    title: 'SkillMarket',
+    show: false,
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.mjs'),
+      contextIsolation: true,
+      nodeIntegration: false,
+    },
+  });
+
+  mainWindow.loadURL(`http://127.0.0.1:${port}`);
+
+  mainWindow.once('ready-to-show', () => mainWindow.show());
+
+  // 关闭 → 隐藏到托盘
+  mainWindow.on('close', (event) => {
+    if (!app.isQuitting) {
+      event.preventDefault();
+      mainWindow.hide();
+    }
+  });
+  mainWindow.on('closed', () => { mainWindow = null; });
+}
+
+// ---------------------------------------------------------------------------
+// 系统托盘
+// ---------------------------------------------------------------------------
+
+function createTray(port) {
+  const iconPath = path.join(ROOT, 'electron', 'tray-icon.png');
+  let icon;
+  try {
+    icon = nativeImage.createFromPath(iconPath).resize({ width: 16, height: 16 });
+  } catch {
+    icon = nativeImage.createEmpty();
+  }
+
+  tray = new Tray(icon);
+  tray.setToolTip('SkillMarket');
+
+  tray.setContextMenu(Menu.buildFromTemplate([
+    {
+      label: '打开 SkillMarket',
+      click: () => {
+        if (mainWindow) { mainWindow.show(); mainWindow.focus(); }
+        else { createWindow(port); }
+      },
+    },
+    { type: 'separator' },
+    {
+      label: '关于',
+      click: () => dialog.showMessageBox({
+        type: 'info',
+        title: '关于 SkillMarket',
+        message: 'SkillMarket v1.3.37',
+        detail: 'Cross-platform skill manager for AI coding tools',
+      }),
+    },
+    { type: 'separator' },
+    {
+      label: '退出',
+      click: () => { app.isQuitting = true; app.quit(); },
+    },
+  ]));
+
+  tray.on('double-click', () => {
+    if (mainWindow) { mainWindow.show(); mainWindow.focus(); }
+  });
+}
+
+// ---------------------------------------------------------------------------
+// 应用菜单
+// ---------------------------------------------------------------------------
+
+function createMenu() {
+  const isMac = process.platform === 'darwin';
+  const template = [
+    {
+      label: 'SkillMarket',
+      submenu: [
+        ...(isMac ? [{ role: 'about' }, { type: 'separator' }] : []),
+        { role: 'quit' },
+      ],
+    },
+    {
+      label: '编辑',
+      submenu: [
+        { role: 'undo' }, { role: 'redo' }, { type: 'separator' },
+        { role: 'cut' }, { role: 'copy' }, { role: 'paste' }, { role: 'selectAll' },
+      ],
+    },
+    {
+      label: '视图',
+      submenu: [
+        { role: 'reload' }, { role: 'forceReload' },
+        { type: 'separator' },
+        { role: 'resetZoom' }, { role: 'zoomIn' }, { role: 'zoomOut' },
+        { type: 'separator' },
+        { role: 'togglefullscreen' },
+      ],
+    },
+    {
+      label: '帮助',
+      submenu: [
+        { label: 'GitHub', click: () => shell.openExternal('https://github.com/wxc2004/market') },
+        { label: '报告问题', click: () => shell.openExternal('https://github.com/wxc2004/market/issues') },
+      ],
+    },
+  ];
+  Menu.setApplicationMenu(Menu.buildFromTemplate(template));
+}
+
+// ---------------------------------------------------------------------------
+// 启动
+// ---------------------------------------------------------------------------
+
+app.whenReady().then(async () => {
+  try {
+    const actualPort = await startServer(PORT);
+    createWindow(actualPort);
+    try { createTray(actualPort); } catch {}
+    createMenu();
+
+    app.on('activate', () => {
+      if (mainWindow === null) createWindow(actualPort);
+      else mainWindow.show();
+    });
+  } catch (err) {
+    dialog.showErrorBox('启动失败', err.message);
+    app.quit();
+  }
+});
+
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') app.quit();
+});
+
+app.on('before-quit', () => {
+  app.isQuitting = true;
+  if (server) try { server.close(); } catch {}
+});

package/electron/preload.mjs

@@ -0,0 +1,18 @@
+/**
+ * =============================================================================
+ * SkillMarket - Electron Preload Script
+ * =============================================================================
+ *
+ * 桥接 Node.js 和渲染进程。通过 contextBridge 安全地暴露 API。
+ * =============================================================================
+ */
+
+import { contextBridge, ipcRenderer } from 'electron';
+
+contextBridge.exposeInMainWorld('electronAPI', {
+  // 平台信息
+  platform: process.platform,
+
+  // 获取应用版本
+  getVersion: () => ipcRenderer.invoke('get-version'),
+});

package/electron//345/220/257/345/212/250/346/241/214/351/235/242/345/272/224/347/224/250.bat

@@ -0,0 +1,3 @@
+@echo off
+cd /d "%~dp0.."
+start "" "node_modules\electron\dist\electron.exe" "electron/main.mjs"

package/gui/app.js

@@ -1933,8 +1933,12 @@ const uploadState = {
   skillName: '',
   file: null,
   data: null, // Parsed result from backend
+  tempDir: '', // Temporary directory path from server
 };
 
+/** 上传文件大小限制：50 MB */
+const MAX_UPLOAD_SIZE = 50 * 1024 * 1024;
+
 /** 初始化 Upload 控件 */
 function initializeUploadControls() {
   const dropzone = document.getElementById('upload-dropzone');
@@ -1946,16 +1950,30 @@ function initializeUploadControls() {
   if (!dropzone) return;
 
   // 文件选择
-  selectBtn.addEventListener('click', () => fileInput.click());
+  selectBtn.addEventListener('click', (e) => {
+    e.stopPropagation(); // 防止冒泡到 dropzone 的 click 事件
+    fileInput.click();
+  });
   fileInput.addEventListener('change', (e) => {
     if (e.target.files.length > 0) {
-      uploadState.file = e.target.files[0];
+      const file = e.target.files[0];
+      if (file.size > MAX_UPLOAD_SIZE) {
+        const sizeMB = (file.size / 1024 / 1024).toFixed(1);
+        showToast(`File too large (${sizeMB} MB). Maximum is 50 MB.`, 'error');
+        e.target.value = '';
+        return;
+      }
+      uploadState.file = file;
       submitBtn.disabled = false;
     }
   });
 
-  // 拖拽上传
-  dropzone.addEventListener('click', () => fileInput.click());
+  // 拖拽上传 — 仅处理拖拽事件，点击由 Choose File 按钮或单独点击处理
+  dropzone.addEventListener('click', (e) => {
+    // 如果点击的是内部按钮，不重复触发文件选择（由按钮的 stopPropagation 处理）
+    if (e.target.closest('button')) return;
+    fileInput.click();
+  });
 
   dropzone.addEventListener('dragover', (e) => {
     e.preventDefault();
@@ -1970,7 +1988,13 @@ function initializeUploadControls() {
     e.preventDefault();
     dropzone.classList.remove('drag-over');
     if (e.dataTransfer.files.length > 0) {
-      uploadState.file = e.dataTransfer.files[0];
+      const file = e.dataTransfer.files[0];
+      if (file.size > MAX_UPLOAD_SIZE) {
+        const sizeMB = (file.size / 1024 / 1024).toFixed(1);
+        showToast(`File too large (${sizeMB} MB). Maximum is 50 MB.`, 'error');
+        return;
+      }
+      uploadState.file = file;
       submitBtn.disabled = false;
     }
   });
@@ -1981,6 +2005,12 @@ function initializeUploadControls() {
       showToast(t('upload.errorNoFile'), 'error');
       return;
     }
+    // 文件大小校验
+    if (uploadState.file.size > MAX_UPLOAD_SIZE) {
+      const sizeMB = (uploadState.file.size / 1024 / 1024).toFixed(1);
+      showToast(`File too large (${sizeMB} MB). Maximum is 50 MB.`, 'error');
+      return;
+    }
     // Use skill name override if provided
     const override = skillNameInput.value.trim();
     handleUpload(uploadState.file, override || undefined);
@@ -2007,6 +2037,7 @@ function resetUploadView() {
   uploadState.file = null;
   uploadState.data = null;
   uploadState.skillName = '';
+  uploadState.tempDir = '';
   document.getElementById('upload-phase1').classList.remove('hidden');
   document.getElementById('upload-phase2').classList.add('hidden');
   document.getElementById('upload-submit-btn').disabled = true;
@@ -2068,6 +2099,7 @@ async function handleUpload(file, skillNameOverride) {
 
     uploadState.data = result;
     uploadState.skillName = skillNameOverride || result.skillName;
+    uploadState.tempDir = result.tempDir || '';
 
     // Switch to preview phase
     setTimeout(() => {
@@ -2151,6 +2183,7 @@ async function executeUploadAction(action) {
       body: JSON.stringify({
         skillName: uploadState.skillName,
         action: action,
+        tempDir: uploadState.tempDir,
       }),
     });
 

package/package.json

@@ -1,16 +1,23 @@
 {
   "name": "itismyskillmarket",
-  "version": "1.3.37",
+  "version": "1.3.39",
   "description": "Cross-platform skill manager for AI coding tools",
   "type": "module",
   "bin": {
     "skm": "dist/index.js"
   },
+  "main": "electron/main.mjs",
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",
     "test": "vitest",
-    "build:exe": "node scripts/build-exe.mjs"
+    "build:exe": "node scripts/build-exe.mjs",
+    "build:installer": "npm run build:exe && ISCC scripts/skillmarket.iss",
+    "build:installer:ps": "npm run build:exe && powershell -ExecutionPolicy Bypass -File scripts/install.ps1 -Silent",
+    "install:local": "powershell -ExecutionPolicy Bypass -File scripts/install.ps1",
+    "uninstall:local": "powershell -ExecutionPolicy Bypass -File scripts/install.ps1 -Uninstall",
+    "electron:dev": "npm run build && npx electron electron/main.mjs",
+    "electron:build": "npm run build && npx electron-builder build --win"
   },
   "dependencies": {
     "adm-zip": "^0.5.17",
@@ -19,15 +26,65 @@
     "tar": "^7.5.15"
   },
   "devDependencies": {
+    "@types/adm-zip": "^0.5.8",
     "@types/fs-extra": "^11.0.4",
     "@yao-pkg/pkg": "^6.19.0",
+    "electron": "^33.0.0",
+    "electron-builder": "^25.0.0",
     "postject": "^1.0.0-alpha.6",
     "tsup": "^8.0.0",
     "typescript": "^5.3.0",
     "vitest": "^1.2.0"
   },
+  "build": {
+    "appId": "com.skillmarket.app",
+    "productName": "SkillMarket",
+    "directories": {
+      "output": "release"
+    },
+    "files": [
+      "dist/**/*",
+      "electron/**/*",
+      "gui/**/*",
+      "package.json"
+    ],
+    "win": {
+      "target": [
+        {
+          "target": "nsis",
+          "arch": [
+            "x64"
+          ]
+        }
+      ],
+      "icon": "electron/icon.ico"
+    },
+    "nsis": {
+      "oneClick": false,
+      "allowToChangeInstallationDirectory": true,
+      "createDesktopShortcut": true,
+      "createStartMenuShortcut": true,
+      "shortcutName": "SkillMarket",
+      "uninstallDisplayName": "SkillMarket",
+      "installerIcon": "electron/icon.ico",
+      "uninstallerIcon": "electron/icon.ico"
+    },
+    "extraResources": [
+      {
+        "from": "scripts",
+        "to": "scripts",
+        "filter": [
+          "*.ps1",
+          "*.iss"
+        ]
+      }
+    ],
+    "asar": true,
+    "compression": "maximum"
+  },
   "files": [
     "dist",
-    "gui"
+    "gui",
+    "electron"
   ]
 }