grasp-sdk 0.1.7__tar.gz → 0.1.8__tar.gz

{grasp_sdk-0.1.7/grasp_sdk.egg-info → grasp_sdk-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grasp_sdk
-Version: 0.1.7
+Version: 0.1.8
 Summary: Python SDK for Grasp E2B - Browser automation and sandbox management
 Home-page: https://github.com/grasp-team/grasp-e2b
 Author: Grasp Team

{grasp_sdk-0.1.7 → grasp_sdk-0.1.8}/grasp_sdk/__init__.py

@@ -24,7 +24,7 @@ from .models import (
     SandboxStatus,
 )
 
-__version__ = "0.1.7"
+__version__ = "0.1.8"
 __author__ = "Grasp Team"
 __email__ = "team@grasp.dev"
 
@@ -168,7 +168,7 @@ class GraspServer:
             self.config['sandbox'],
             browser_config
         )
-        await self.browser_service.initialize()
+        await self.browser_service.initialize(browser_type)
 
         # Register server
         _servers[str(self.browser_service.id)] = self
@@ -177,7 +177,7 @@ class GraspServer:
         })
         
         self.logger.info('🌐 Launching Chromium browser with CDP...')
-        cdp_connection = await self.browser_service.launch_browser(browser_type)
+        cdp_connection = await self.browser_service.launch_browser()
         
         self.logger.info('✅ Browser launched successfully!')
         self.logger.debug(

grasp_sdk-0.1.8/grasp_sdk/sandbox/bootstrap-chrome-stable.mjs

@@ -0,0 +1,69 @@
+import { spawn } from 'child_process';
+
+// const asblockPlugin = '/home/user/.config/google-chrome/Default/Extensions/adblock';
+
+const args = [
+  '--no-sandbox',
+  '--disable-setuid-sandbox',
+  '--disable-dev-shm-usage',
+  '--disable-gpu',
+  '--disable-software-rasterizer',
+  '--user-data-dir=/home/user/.browser-context'
+];
+
+args.push(
+  // 避免缓存积累影响性能
+  '--disable-application-cache',
+
+  // 关闭所有硬件加速特性，防止 GPU 相关崩溃
+  '--disable-accelerated-2d-canvas',
+  '--disable-accelerated-video-decode',
+
+  // 禁用后台渲染，减少无关资源消耗
+  '--disable-background-timer-throttling',
+  '--disable-backgrounding-occluded-windows',
+  '--disable-renderer-backgrounding',
+
+  // 避免过度日志影响性能
+  '--disable-logging',
+
+  // 禁用不必要的多媒体解码
+  '--mute-audio',
+
+  // 避免崩溃时弹窗
+  '--no-default-browser-check',
+  '--no-first-run',
+  '--headless=new',
+);
+
+args.push(
+  `--remote-debugging-port=9222`,
+  '--remote-debugging-address=0.0.0.0',
+  'about:blank',
+);
+
+const chromePath = '/usr/bin/google-chrome';
+
+// 启动 Chrome 并启用远程调试
+const chrome = spawn(chromePath, args, {
+  env: { ...process.env, DISPLAY: ':99' }
+});
+
+chrome.stdout.on('data', (data) => {
+  console.log(`stdout: ${data}`);
+});
+
+chrome.stderr.on('data', (data) => {
+  console.error(`stderr: ${data}`);
+});
+
+chrome.on('close', (code) => {
+  console.log(`Chrome process exited with code ${code}`);
+});
+
+console.log('Browser launched and ready...');
+
+// 保持进程不退出，并监听中止信号
+process.stdin.resume();
+process.on('SIGINT', () => process.exit());
+process.on('SIGTERM', () => process.exit());

{grasp_sdk-0.1.7 → grasp_sdk-0.1.8}/grasp_sdk/sandbox/http-proxy.mjs

@@ -1,5 +1,6 @@
 import httpProxy from 'http-proxy';
 import http from 'http';
+import fs from 'fs';
 
 import { Logtail } from '@logtail/node';
 import * as Sentry from "@sentry/node";
@@ -94,7 +95,7 @@ function parseWebSocketFrame(buffer) {
   return payloadData.toString('utf8');
 }
 
-const sandboxId = process.env.SANDBOX_ID;
+let sandboxId = '';
 const cdpPort = Number(process.env.CDP_PORT);
 const headless = process.env.HEADLESS !== 'false';
 const enableAdblock = process.env.ADBLOCK !== 'false';
@@ -115,7 +116,8 @@ try {
 
   // 监听 WebSocket 事件
   proxy.on('open', () => {
-    console.log('🔌 CDP WebSocket connection established');
+    sandboxId = fs.readFileSync('/home/user/.sandbox_id', 'utf-8');
+    console.log('🔌 CDP WebSocket connection established', sandboxId);
     const wsId = Date.now();
     logger.info('CDP WebSocket connection established', { sandboxId, wsId });
     Sentry.addBreadcrumb({
@@ -230,7 +232,7 @@ try {
           console.log('📨 CDP WebSocket message:', parsed);
           logger.info('CDP WebSocket message received', {
             data: parsed,
-            sandboxId: process.env.SANDBOX_ID,
+            sandboxId,
           });
           Sentry.addBreadcrumb({
             category: 'websocket',
@@ -251,7 +253,7 @@ try {
           logger.warn('Failed to parse CDP WebSocket message', {
             error: err.message,
             data: message,
-            sandboxId: process.env.SANDBOX_ID
+            sandboxId,
           });
         }
       }

{grasp_sdk-0.1.7 → grasp_sdk-0.1.8}/grasp_sdk/services/browser.py

@@ -91,19 +91,34 @@ class BrowserService:
             })
             return default_logger.child('BrowserService')
 
-    async def initialize(self) -> None:
+    async def initialize(self, browser_type: str) -> None:
         """Initialize the Grasp sandbox.
         
         Returns:
             Promise that resolves when sandbox is ready
         """
         self.logger.info('Initializing Browser service')
-        await self.sandbox_service.create_sandbox('grasp-run-template')
+        envs = {
+            'CDP_PORT': '9222',
+            'BROWSER_ARGS': json.dumps(self.config['args']),
+            'LAUNCH_TIMEOUT': str(self.config['launchTimeout']),
+            'SANDBOX_TIMEOUT': str(self.sandbox_service.timeout),
+            'HEADLESS': str(self.config['headless']).lower(),
+            'NODE_ENV': 'production',
+            # 'SANDBOX_ID': self.sandbox_service.id,
+            'WORKSPACE': self.sandbox_service.workspace,
+            'BS_SOURCE_TOKEN': 'Qth8JGboEKVersqr1PSsUFMW',
+            'BS_INGESTING_HOST': 's1363065.eu-nbg-2.betterstackdata.com',
+            'SENTRY_DSN': 'https://21fa729ceb72d7f0adef06b4f786c067@o4509574910509056.ingest.us.sentry.io/4509574913720320',
+            **self.config['envs']
+        }
+        await self.sandbox_service.create_sandbox(f'grasp-run-{browser_type}', envs)
+        if(self.sandbox_service.sandbox is not None):
+            await self.sandbox_service.sandbox.files.write('/home/user/.sandbox_id', self.id)
         self.logger.info('Grasp sandbox initialized successfully')
     
     async def launch_browser(
         self,
-        browser_type: str = 'chromium'
     ) -> CDPConnection:
         """Launch Chromium browser with CDP server.
         
@@ -123,41 +138,16 @@ class BrowserService:
             self.logger.info(
                 f'Launching Chromium browser with CDP (port: 9222, headless: {self.config["headless"]})')
             
-            
-            # Check if adblock is enabled and adjust browser type
-            if (
-                self.config['envs'].get('ADBLOCK') == 'true' and 
-                browser_type == 'chromium'
-            ):
-                self.logger.warn(
-                    '⚠️ Adblock is enabled. Should use chrome-stable instead.'
-                )
-                browser_type = 'chrome-stable'
-            
             # Read the Playwright script
-            script_path = Path(__file__).parent.parent / 'sandbox' / 'http-proxy.mjs'
+            # script_path = Path(__file__).parent.parent / 'sandbox' / 'http-proxy.mjs'
             
-            try:
-                with open(script_path, 'r', encoding='utf-8') as f:
-                    playwright_script = f.read()
-            except FileNotFoundError:
-                raise RuntimeError(f'Browser script not found: {script_path}')
-            
-            # Prepare environment variables
-            envs = {
-                'CDP_PORT': '9222',
-                'BROWSER_ARGS': json.dumps(self.config['args']),
-                'LAUNCH_TIMEOUT': str(self.config['launchTimeout']),
-                'SANDBOX_TIMEOUT': str(self.sandbox_service.timeout),
-                'HEADLESS': str(self.config['headless']).lower(),
-                'NODE_ENV': 'production',
-                'SANDBOX_ID': self.sandbox_service.id,
-                'WORKSPACE': self.sandbox_service.workspace,
-                'BS_SOURCE_TOKEN': 'Qth8JGboEKVersqr1PSsUFMW',
-                'BS_INGESTING_HOST': 's1363065.eu-nbg-2.betterstackdata.com',
-                'SENTRY_DSN': 'https://21fa729ceb72d7f0adef06b4f786c067@o4509574910509056.ingest.us.sentry.io/4509574913720320',
-                **self.config['envs']
-            }
+            # try:
+            #     with open(script_path, 'r', encoding='utf-8') as f:
+            #         playwright_script = f.read()
+            # except FileNotFoundError:
+            #     raise RuntimeError(f'Browser script not found: {script_path}')
+
+            playwright_script = '/home/user/http-proxy.mjs'
             
             # Prepare script options
             from ..models import IScriptOptions
@@ -166,7 +156,6 @@ class BrowserService:
                 'background': True,
                 'nohup': not self.sandbox_service.is_debug,
                 'timeoutMs': 0,
-                'envs': envs,
                 'preCommand': '' if self.config['headless'] else 'xvfb-run -a -s "-screen 0 1280x1024x24" '
             }
             

{grasp_sdk-0.1.7 → grasp_sdk-0.1.8}/grasp_sdk/services/sandbox.py

@@ -123,7 +123,7 @@ class SandboxService:
         """Get timeout value."""
         return self.config['timeout']
     
-    async def create_sandbox(self, template_id: str) -> None:
+    async def create_sandbox(self, template_id: str, envs: Optional[Dict[str, str]] = None) -> None:
         """
         Creates and starts a new sandbox.
         
@@ -149,7 +149,8 @@ class SandboxService:
             self.sandbox = await AsyncSandbox.create(
                 template=template_id,    
                 api_key=api_key,
-                timeout=self.config['timeout'] // 1000  # Convert ms to seconds
+                timeout=self.config['timeout'] // 1000,  # Convert ms to seconds
+                envs=envs,
             )
 
             self.status = SandboxStatus.RUNNING
@@ -322,7 +323,7 @@ class SandboxService:
         Runs JavaScript code in the sandbox.
         
         Args:
-            code: JavaScript code to execute
+            code: JavaScript code to execute, or file path starting with '/home/user/'
             options: Script execution options
             
         Returns:
@@ -331,6 +332,10 @@ class SandboxService:
             
         Raises:
             RuntimeError: If sandbox is not running or script execution fails
+            
+        Note:
+            If code starts with '/home/user/', it will be treated as a file path.
+            Otherwise, it will be treated as JavaScript code and written to a temporary file.
         """
         if not self.sandbox or self.status != SandboxStatus.RUNNING:
             raise RuntimeError('Sandbox is not running. Call create_sandbox() first.')
@@ -341,9 +346,14 @@ class SandboxService:
         try:
             # Generate temporary file name in working directory
             timestamp = int(time.time() * 1000)
-            extension = 'mjs' if options['type'] == 'esm' else 'js'
-            working_dir = options.get('cwd', self.DEFAULT_WORKING_DIRECTORY)
-            script_path = f'{working_dir}/script_{timestamp}.{extension}'
+            script_path = code
+            
+            if not code.startswith('/home/user/'):
+                extension = 'mjs' if options['type'] == 'esm' else 'js'
+                working_dir = options.get('cwd', self.DEFAULT_WORKING_DIRECTORY)
+                script_path = f'{working_dir}/script_{timestamp}.{extension}'
+                # Write code to temporary file
+                await self.sandbox.files.write(script_path, code)
             
             self.logger.debug('Running JavaScript code in sandbox', {
                 'type': options['type'],
@@ -351,9 +361,6 @@ class SandboxService:
                 'codeLength': len(code),
             })
             
-            # Write code to temporary file
-            await self.sandbox.files.write(script_path, code)
-            
             # Choose execution command based on type
             pre_command = options.get('preCommand', '')
             command = f'{pre_command}node {script_path}'
@@ -374,16 +381,6 @@ class SandboxService:
             # Execute the script
             result = await self.run_command(command, cmd_options)
             
-            # Cleanup temporary file (if not background execution)
-            if not options.get('background', False):
-                try:
-                    await self.run_command(f'rm -f {script_path}')
-                except Exception as cleanup_error:
-                    self.logger.warn('Failed to cleanup script file', {
-                        'scriptPath': script_path,
-                        'error': cleanup_error,
-                    })
-            
             return result
         
         except Exception as error:

{grasp_sdk-0.1.7 → grasp_sdk-0.1.8/grasp_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grasp_sdk
-Version: 0.1.7
+Version: 0.1.8
 Summary: Python SDK for Grasp E2B - Browser automation and sandbox management
 Home-page: https://github.com/grasp-team/grasp-e2b
 Author: Grasp Team

{grasp_sdk-0.1.7 → grasp_sdk-0.1.8}/grasp_sdk.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ grasp_sdk.egg-info/not-zip-safe
 grasp_sdk.egg-info/requires.txt
 grasp_sdk.egg-info/top_level.txt
 grasp_sdk/models/__init__.py
+grasp_sdk/sandbox/bootstrap-chrome-stable.mjs
 grasp_sdk/sandbox/chrome-stable.mjs
 grasp_sdk/sandbox/chromium.mjs
 grasp_sdk/sandbox/http-proxy.mjs

{grasp_sdk-0.1.7 → grasp_sdk-0.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "grasp_sdk"
-version = "0.1.7"
+version = "0.1.8"
 authors = [
     {name = "Grasp Team", email = "team@grasp.com"},
 ]