skill-base 2.0.16 → 2.0.18

package/src/utils/crypto.js

@@ -1,24 +1,24 @@
 const bcrypt = require('bcryptjs');
 const { v4: uuidv4 } = require('uuid');
 
-// 密码哈希（10 rounds）
+// Password hash (10 rounds)
 function hashPassword(password) {
   return bcrypt.hashSync(password, 10);
 }
 
-// 验证密码
+// Verify password
 function verifyPassword(password, hash) {
   return bcrypt.compareSync(password, hash);
 }
 
-// 生成 PAT Token，格式：sk-base-{uuid去掉横线}
+// Generate PAT Token, format: sk-base-{uuid without dashes}
 function generatePAT() {
   return 'sk-base-' + uuidv4().replace(/-/g, '');
 }
 
-// 生成 CLI 验证码，格式：XXXX-XXXX（大写字母+数字）
+// Generate CLI verification code, format: XXXX-XXXX (uppercase letters + numbers)
 function generateCliCode() {
-  const chars = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789'; // 排除易混淆字符
+  const chars = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789'; // Exclude confusing characters
   let code = '';
   for (let i = 0; i < 8; i++) {
     if (i === 4) code += '-';
@@ -27,7 +27,7 @@ function generateCliCode() {
   return code;
 }
 
-// 生成 Session ID
+// Generate Session ID
 function generateSessionId() {
   return uuidv4();
 }

package/src/utils/detect-language.js

@@ -0,0 +1,56 @@
+/**
+ * For Cappy / CLI: zh vs en.
+ * Order: explicit locale env vars → (macOS only) system region → Intl.
+ */
+
+const { execFileSync } = require('child_process');
+
+function parseLocaleTag(raw) {
+  if (!raw || typeof raw !== 'string') return null;
+  const first = raw.trim().split(':')[0].split('.')[0].split('@')[0];
+  if (!first || first === 'C' || first === 'POSIX') return null;
+  const norm = first.toLowerCase().replace(/_/g, '-');
+  if (norm.startsWith('zh')) return 'zh';
+  if (norm.startsWith('en')) return 'en';
+  return null;
+}
+
+/**
+ * Terminals often set LANG=C.UTF-8; Intl resolves to en-US, but the OS UI language may still be Chinese.
+ * AppleLocale matches System Settings and needs no extra npm packages.
+ */
+function detectDarwinLocalePreference() {
+  if (process.platform !== 'darwin') return null;
+  try {
+    const out = execFileSync('/usr/bin/defaults', ['read', '-g', 'AppleLocale'], {
+      encoding: 'utf8',
+      maxBuffer: 256,
+      timeout: 3000
+    });
+    return parseLocaleTag(out);
+  } catch {
+    return null;
+  }
+}
+
+function detectSystemLanguage() {
+  const envKeys = ['LC_ALL', 'LC_MESSAGES', 'LANG', 'LANGUAGE'];
+  for (const k of envKeys) {
+    const v = process.env[k];
+    if (!v) continue;
+    const tag = parseLocaleTag(v);
+    if (tag) return tag;
+  }
+
+  const fromDarwin = detectDarwinLocalePreference();
+  if (fromDarwin) return fromDarwin;
+
+  try {
+    const locale = Intl.DateTimeFormat().resolvedOptions().locale || '';
+    return locale.toLowerCase().startsWith('zh') ? 'zh' : 'en';
+  } catch {
+    return 'en';
+  }
+}
+
+module.exports = { detectSystemLanguage };

package/src/utils/permission.js

@@ -1,14 +1,14 @@
 const db = require('../database');
 
 /**
- * 检查用户是否有 Skill 的指定权限
- * @param {object} user - request.user 对象
+ * Check if user has specified permission for a Skill
+ * @param {object} user - request.user object
  * @param {string} skillId - Skill ID
  * @param {string} requiredRole - 'owner' | 'collaborator' | 'any'
  * @returns {boolean}
  */
 function hasSkillPermission(user, skillId, requiredRole = 'any') {
-  // 管理员拥有所有权限
+  // Admin has all permissions
   if (user.role === 'admin') return true;
   
   const collaborator = db.prepare(
@@ -18,21 +18,21 @@ function hasSkillPermission(user, skillId, requiredRole = 'any') {
   if (!collaborator) return false;
   if (requiredRole === 'any') return true;
   if (requiredRole === 'owner') return collaborator.role === 'owner';
-  if (requiredRole === 'collaborator') return true; // owner 也有 collaborator 权限
+  if (requiredRole === 'collaborator') return true; // owner also has collaborator permission
   return false;
 }
 
 /**
- * 检查用户是否可以发布 Skill
+ * Check if user can publish Skill
  */
 function canPublishSkill(user, skillId) {
   const skill = db.prepare('SELECT id FROM skills WHERE id = ?').get(skillId);
-  if (!skill) return true;  // 新 Skill，任何登录用户都可创建
+  if (!skill) return true;  // New Skill, any logged-in user can create
   return hasSkillPermission(user, skillId, 'any');
 }
 
 /**
- * 检查用户是否可以管理协作者/删除 Skill
+ * Check if user can manage collaborators / delete Skill
  */
 function canManageSkill(user, skillId) {
   return hasSkillPermission(user, skillId, 'owner');

package/src/utils/zip.js

@@ -1,12 +1,12 @@
 const path = require('path');
 const fs = require('fs');
 
-// 获取 zip 存储目录
+// Get zip storage directory
 function getDataDir() {
   return process.env.DATA_DIR || path.join(__dirname, '../../data');
 }
 
-// 确保 skill 的存储目录存在
+// Ensure skill storage directory exists
 function ensureSkillDir(skillId) {
   const dir = path.join(getDataDir(), 'skills', skillId);
   if (!fs.existsSync(dir)) {
@@ -15,19 +15,19 @@ function ensureSkillDir(skillId) {
   return dir;
 }
 
-// 生成时间戳版本号 vYYYYMMDD.HHMMSS
+// Generate timestamp version number vYYYYMMDD.HHMMSS
 function generateVersionNumber() {
   const now = new Date();
   const pad = (n) => String(n).padStart(2, '0');
   return `v${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}.${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
 }
 
-// 获取 zip 文件的完整路径
+// Get full path of zip file
 function getZipPath(skillId, version) {
   return path.join(getDataDir(), 'skills', skillId, `${version}.zip`);
 }
 
-// 根据数据库中的 zip_path 解析实际文件路径，兼容历史相对路径格式
+// Resolve actual file path from zip_path in database, compatible with historical relative path format
 function resolveZipPath(zipPath, skillId, version) {
   if (zipPath) {
     if (path.isAbsolute(zipPath)) {
@@ -38,7 +38,7 @@ function resolveZipPath(zipPath, skillId, version) {
   return getZipPath(skillId, version);
 }
 
-// 获取 zip 文件相对路径（存入数据库）
+// Get relative path of zip file (stored in database)
 function getZipRelativePath(skillId, version) {
   return `skills/${skillId}/${version}.zip`;
 }