@cloudbase/toolbox 0.7.13 → 0.7.14

package/lib/system/os.js

@@ -6,6 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOSInfo = exports.getPlatformRelease = void 0;
 const os_1 = __importDefault(require("os"));
 const macOSMap = new Map([
+    [24, 'Sequoia'],
+    [23, 'Sonoma'],
+    [22, 'Ventura'],
+    [21, 'Monterey'],
     [20, 'BigSur'],
     [19, 'Catalina'],
     [18, 'Mojave'],
@@ -21,9 +25,19 @@ const macOSMap = new Map([
     [8, 'Tiger'],
     [7, 'Panther'],
     [6, 'Jaguar'],
-    [5, 'Puma']
+    [5, 'Puma'] // macOS 10.1 Puma (2001)
 ]);
 const winMap = new Map([
+    ['10.0.22000', '11'],
+    ['10.0.19041', '10'],
+    ['10.0.18363', '10'],
+    ['10.0.17763', '10'],
+    ['10.0.17134', '10'],
+    ['10.0.16299', '10'],
+    ['10.0.15063', '10'],
+    ['10.0.14393', '10'],
+    ['10.0.10586', '10'],
+    ['10.0.10240', '10'],
     ['10.0', '10'],
     ['6.3', '8.1'],
     ['6.2', '8'],
@@ -34,26 +48,49 @@ const winMap = new Map([
     ['5.0', '2000'],
     ['4.9', 'ME'],
     ['4.1', '98'],
-    ['4.0', '95']
+    ['4.0', '95'] // Windows 95 (1995)
 ]);
 function getPlatformRelease(platform, release) {
     // macOS
     if (platform === 'darwin') {
-        const releaseNum = Number(release.split('.')[0]);
-        const name = macOSMap.get(releaseNum);
+        const releaseParts = release.split('.');
+        const majorNum = Number(releaseParts[0]);
+        const minorNum = Number(releaseParts[1]) || 0;
+        const name = macOSMap.get(majorNum);
         let version;
-        if (releaseNum >= 20) {
-            version = '11.' + (releaseNum - 20);
+        // macOS 11 及以上版本 (majorNum >= 20)
+        if (majorNum >= 20) {
+            // releaseNum 20 -> macOS 11, 21 -> macOS 12, etc.
+            const majorVersion = majorNum - 9;
+            version = `${majorVersion}.${minorNum}`;
+            // macOS 10.x 版本 (majorNum < 20)
         }
         else {
-            version = '10.' + (releaseNum - 4);
+            // releaseNum 19 -> 10.15, 18 -> 10.14, etc.
+            const minorVersion = majorNum - 4;
+            version = `10.${minorVersion}`;
         }
         return `${name} ${version}`;
     }
     // windows
     if (platform === 'win32') {
-        const version = (/\d+\.\d/.exec(release) || [])[0];
-        return `Windows ${winMap.get(version)}`;
+        // 尝试精确匹配完整版本号
+        let windowsVersion = winMap.get(release);
+        if (!windowsVersion) {
+            // 如果没有精确匹配，尝试匹配主版本号
+            const majorVersion = (/^\d+\.\d+/.exec(release) || [])[0];
+            windowsVersion = winMap.get(majorVersion);
+        }
+        if (!windowsVersion) {
+            // 如果还是没有匹配，尝试只匹配第一部分
+            const firstPart = (/^\d+/.exec(release) || [])[0];
+            if (firstPart === '10') {
+                windowsVersion = '10';
+            }
+        }
+        // 显示完整的版本信息
+        const versionDisplay = windowsVersion || release;
+        return `Windows ${versionDisplay}`;
     }
     // 其他 Linux
     return 'Linux';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/toolbox",
-    "version": "0.7.13",
+    "version": "0.7.14",
     "description": "The toolbox for cloudbase",
     "main": "lib/index.js",
     "scripts": {