deveco-mcp-server 0.1.6 → 0.1.8

package/index.js

@@ -41,34 +41,147 @@ function getBinaryPaths() {
     console.error(`Error: Platform package ${packageName} not found.`);
     console.error('Attempting to install platform package...');
     
-    // Try to install the platform package
+    // 检查 npm 镜像源（仅提示，不影响安装）
+    try {
+      const { execSync } = require('child_process');
+      const registry = execSync('npm config get registry', { encoding: 'utf-8' }).trim();
+      if (!registry.includes('npmjs.org')) {
+        console.warn(`\n⚠️  Detected non-official npm registry: ${registry}`);
+        console.warn('Auto-install will use official registry (https://registry.npmjs.org/) to ensure package availability.\n');
+      }
+    } catch (regErr) {
+      // 忽略检查错误
+    }
+    
     const { execSync } = require('child_process');
+    const os = require('os');
+    
+    // Detect if we're in npx temporary directory
+    const isNpx = __dirname.includes('_npx') || 
+                  __dirname.includes('npm-cache') || 
+                  __dirname.includes('npx-') ||
+                  process.env.npm_config_user_config;
+    
+    let installDir = __dirname;
+    let binDir = null;
+    
+    // If in npx, install to user's home directory cache
+    if (isNpx) {
+      const homeDir = os.homedir();
+      installDir = path.join(homeDir, '.deveco-mcp-cache');
+      
+      // Create cache directory if it doesn't exist
+      if (!fs.existsSync(installDir)) {
+        fs.mkdirSync(installDir, { recursive: true });
+      }
+    }
+    
     try {
-      execSync(`npm install ${packageName}`, { 
-        stdio: 'inherit',
-        cwd: __dirname 
+      // Install the platform package with official registry (ignore output to avoid JSON parsing errors)
+      // Force using official registry to avoid mirror sync issues
+      execSync(`npm install --registry=https://registry.npmjs.org ${packageName}`, {
+        stdio: 'ignore', // Ignore output completely
+        cwd: installDir,
+        timeout: 60000 // 60 second timeout
       });
       
-      // Try to resolve again
-      const packagePath = require.resolve(packageName);
-      const binDir = path.dirname(packagePath);
+      // Find the installed package - check multiple possible locations
+      const nodeModulesPath = path.join(installDir, 'node_modules', packageName);
+      const packageJsonPath = path.join(nodeModulesPath, 'package.json');
+      
+      if (fs.existsSync(packageJsonPath)) {
+        binDir = nodeModulesPath;
+      } else {
+        // Try to resolve using require with multiple paths
+        const searchPaths = [
+          installDir,
+          path.join(installDir, 'node_modules'),
+          __dirname,
+          path.join(__dirname, 'node_modules')
+        ];
+        
+        for (const searchPath of searchPaths) {
+          try {
+            const packagePath = require.resolve(packageName, { paths: [searchPath] });
+            binDir = path.dirname(packagePath);
+            break;
+          } catch (resolveErr) {
+            // Continue to next path
+          }
+        }
+        
+        // If still not found, use the expected path anyway
+        if (!binDir) {
+          binDir = nodeModulesPath;
+        }
+      }
+    } catch (installErr) {
+      // Installation failed, try alternative: install to current directory with official registry
+      try {
+        execSync(`npm install --registry=https://registry.npmjs.org ${packageName}`, {
+          stdio: 'ignore',
+          cwd: __dirname,
+          timeout: 60000
+        });
+        
+        const localNodeModules = path.join(__dirname, 'node_modules', packageName);
+        const localPackageJson = path.join(localNodeModules, 'package.json');
+        
+        if (fs.existsSync(localPackageJson)) {
+          binDir = localNodeModules;
+        } else {
+          throw installErr;
+        }
+      } catch (altErr) {
+        // All installation attempts failed
+        console.error('\n❌ Failed to install platform package automatically.');
+        console.error('\nTroubleshooting steps:');
+        console.error(`\n1. Check npm registry (should be https://registry.npmjs.org/):`);
+        console.error(`   npm config get registry`);
+        console.error(`   npm config set registry https://registry.npmjs.org/`);
+        console.error(`\n2. Clear npm cache:`);
+        console.error(`   npm cache clean --force`);
+        console.error(`\n3. Manual install (recommended):`);
+        console.error(`   npm install -g ${packageName}`);
+        console.error(`   npm install -g deveco-mcp-server`);
+        console.error(`\n4. Or use with registry flag in MCP config:`);
+        console.error(`   "args": ["--registry=https://registry.npmjs.org", "-y", "deveco-mcp-server"]`);
+        console.error(`\n5. Check if package exists:`);
+        console.error(`   npm view ${packageName}`);
+        process.exit(1);
+      }
+    }
+    
+    // Verify the installed package exists and has the expected structure
+    if (binDir && fs.existsSync(binDir)) {
+      // Check if binary files exist
+      let serverPath, toolboxPath;
       
       if (process.platform === 'win32') {
-        return {
-          server: path.join(binDir, 'deveco-mcp-server.exe'),
-          toolbox: path.join(binDir, 'deveco-toolbox.exe')
-        };
+        serverPath = path.join(binDir, 'deveco-mcp-server.exe');
+        toolboxPath = path.join(binDir, 'deveco-toolbox.exe');
       } else {
+        serverPath = path.join(binDir, 'Contents', 'MacOS', 'deveco-mcp-server');
+        toolboxPath = path.join(binDir, 'Contents', 'MacOS', 'deveco-toolbox');
+      }
+      
+      // Verify server binary exists
+      if (fs.existsSync(serverPath)) {
         return {
-          server: path.join(binDir, 'Contents', 'MacOS', 'deveco-mcp-server'),
-          toolbox: path.join(binDir, 'Contents', 'MacOS', 'deveco-toolbox')
+          server: serverPath,
+          toolbox: toolboxPath
         };
+      } else {
+        // Binary not found at expected location, try to find it
+        console.error(`Installed package found at ${binDir}, but binary not at expected location.`);
+        console.error(`Expected: ${serverPath}`);
+        process.exit(1);
       }
-    } catch (installErr) {
-      console.error('Failed to install platform package automatically.');
-      console.error('Please run: npm install --force');
-      process.exit(1);
     }
+    
+    // Should not reach here, but just in case
+    console.error('Failed to locate installed platform package.');
+    process.exit(1);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deveco-mcp-server",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "NPM wrapper for deveco-mcp-server - HarmonyOS development MCP server with platform-specific binaries",
   "keywords": [
     "mcp",
@@ -16,12 +16,13 @@
     "deveco-mcp-server": "index.js"
   },
   "optionalDependencies": {
-    "deveco-mcp-server-win32-x64": "0.1.6",
-    "deveco-mcp-server-darwin-arm64": "0.1.6"
+    "deveco-mcp-server-win32-x64": "0.1.8",
+    "deveco-mcp-server-darwin-arm64": "0.1.8",
+    "deveco-mcp-server-darwin-x64": "0.1.8"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/your-org/deveco-mcp.git"
+    "url": "https://github.com/open-deveco/deveco-toolbox.git"
   },
   "author": "",
   "license": "ISC"