refactor(docker): simplify image references and update service configurations

Mile-Away · Mile-Away · commit b79c899be66d · 2025-12-13T01:24:53.000+08:00
feat(dashboard): add Camera widget and update app definitions

fix(i18n): update homepage title for clarity

fix(vite): extend service worker denylist to include /xyzen

chore(deps): upgrade @sciol/xyzen to version 0.4.3
diff --git a/docker/docker-compose.infra.yaml b/docker/docker-compose.infra.yaml
@@ -1,7 +1,7 @@
 name: sciol-infra
 services:
   network-service:
-    image: registry.sciol.ac.cn/library/alpine:3.22
+    image: alpine:3.22
     ports:
       # - '${POSTGRES_PORT:-5432}:5432'
       - '${MINIO_PORT:-9000}:9000'
@@ -16,8 +16,53 @@ services:
     networks:
       - sciol-network
 
+  # nacos:
+  #   image: nacos/nacos-server:v3.0.2
+  #   container_name: sciol-nacos
+  #   pull_policy: if_not_present
+  #   network_mode: 'service:network-service'
+  #   environment:
+  #     - MODE=standalone
+  #     - PREFER_HOST_MODE=hostname
+  #     - NACOS_AUTH_ENABLE=false
+  #     - NACOS_AUTH_TOKEN=012345678901234567890123456789012345678901234567890123456789
+  #     - NACOS_AUTH_IDENTITY_KEY=serverIdentity
+  #     - NACOS_AUTH_IDENTITY_VALUE=security
+  #     # - NACOS_AUTH_ADMIN_USERNAME=nacos
+  #     # - NACOS_AUTH_ADMIN_PASSWORD=nacos
+  #   restart: always
+  #   deploy:
+  #     replicas: ${NACOS_REPLICAS:-1}
+  #   volumes:
+  #     - nacos-data:/home/nacos/data
+  #     - ../infra/nacos/init.sh:/init.sh
+  #   entrypoint: >
+  #     /bin/sh -c "
+  #       /home/nacos/bin/docker-startup.sh &
+  #       pid=$$!
+
+  #       # 等待 Nacos 启动
+  #       until curl -i http://localhost:8080 > /dev/null 2>&1; do
+  #         echo 'Waiting for Nacos to start...'
+  #         sleep 2
+  #       done
+
+  #       # 执行初始化脚本
+  #       chmod +x /init.sh
+  #       /init.sh
+
+  #       wait $$pid
+  #     "
+  #   healthcheck:
+  #     test:
+  #       ['CMD-SHELL', 'curl --fail --silent --max-time 3 http://localhost:8080']
+  #     interval: 30s
+  #     timeout: 5s
+  #     retries: 3
+  #   attach: false
+
   postgresql:
-    image: registry.sciol.ac.cn/library/postgres:16.8-alpine
+    image: postgres:16.8-alpine
     pull_policy: if_not_present
     network_mode: 'service:network-service'
     restart: always
@@ -43,7 +88,7 @@ services:
       - db-data:/var/lib/postgresql/data
 
   minio:
-    image: registry.sciol.ac.cn/library/minio
+    image: minio/minio:RELEASE.2025-04-22T22-12-26Z
     container_name: sciol-minio
     network_mode: 'service:network-service'
     volumes:
@@ -82,6 +127,14 @@ services:
           echo 'Bucket casdoor already exists'
         fi
 
+        # 检查 Xyzen 存储桶是否存在，不存在则创建
+        if ! mc ls myminio/xyzen > /dev/null 2>&1; then
+          echo 'Creating bucket xyzen'
+          mc mb myminio/xyzen
+        else
+          echo 'Bucket xyzen already exists'
+        fi
+
         mc anonymous set download myminio/casdoor
 
         # 检查 Lab 收集存储桶是否启用，启用则创建
@@ -108,7 +161,7 @@ services:
     attach: false
 
   redis:
-    image: registry.sciol.ac.cn/library/redis:7.4.2-alpine
+    image: redis:7.4.2-alpine
     network_mode: 'service:network-service'
     restart: always
     volumes:
@@ -123,7 +176,7 @@ services:
       replicas: ${REDIS_REPLICAS:-1}
 
   casdoor:
-    image: registry.sciol.ac.cn/library/casdoor:v2.43.0
+    image: casbin/casdoor:v2.43.0
     container_name: sciol-casdoor
     network_mode: 'service:network-service'
     depends_on:
@@ -150,6 +203,8 @@ volumes:
     driver: local
   s3_data:
     driver: local
+  # nacos-data:
+  #   driver: local
 
 networks:
   sciol-network:
diff --git a/service/pkg/core/schedule/control/control.go b/service/pkg/core/schedule/control/control.go
@@ -161,6 +161,7 @@ func (i *control) Connect(ctx context.Context) {
 		"ctx":            ctx,
 		"lab_uuid":       lab.UUID,
 		"lab_id":         lab.ID,
+		"lab_user_id":    labUser.ID,
 	}); err != nil {
 		i.labClient.Delete(lab.UUID)
 		if err := i.consumer.RemoveUser(ctx, lab.UUID.String()); err != nil {
diff --git a/web/package.json b/web/package.json
@@ -23,7 +23,7 @@
     "@radix-ui/react-slot": "^1.2.4",
     "@react-three/drei": "^10.7.6",
     "@react-three/fiber": "^9.4.0",
-    "@sciol/xyzen": "^0.4.1",
+    "@sciol/xyzen": "^0.4.3",
     "@tabler/icons-react": "^3.35.0",
     "@tailwindcss/postcss": "^4.1.14",
     "@tailwindcss/vite": "^4.1.14",
diff --git a/web/src/app/dashboard/Desktop.tsx b/web/src/app/dashboard/Desktop.tsx
@@ -6,6 +6,7 @@ import {
 import {
   Activity,
   Bell,
+  Camera,
   Cpu,
   Home,
   MessageSquare,
@@ -163,20 +164,16 @@ const WorkflowsWidget = () => {
   );
 };
 
-// --- App Definitions ---
-type AppId =
-  | 'nodes'
-  | 'workflows'
-  | 'notifications'
-  | 'news'
-  | 'activity'
-  | 'trending'
-  | 'articles'
-  | 'home'
-  | 'environment';
+const CameraWidget = () => {
+  return (
+    <div className="h-full w-full overflow-hidden">
+      <CameraMonitor hostId="demo-host" cameraId="camera-1" />
+    </div>
+  );
+};
 
 interface AppDefinition {
-  id: AppId;
+  id: string;
   title: string;
   icon: React.ReactNode;
   component: React.FC | null; // null for simple links like Home
@@ -197,6 +194,16 @@ const APPS: AppDefinition[] = [
     defaultHeight: 0,
     href: '/dashboard',
   },
+  {
+    id: 'camera',
+    title: 'Camera',
+    icon: (
+      <Camera className="h-full w-full text-neutral-500 dark:text-neutral-300" />
+    ),
+    component: CameraWidget,
+    defaultWidth: 520,
+    defaultHeight: 360,
+  },
   {
     id: 'environment',
     title: 'Environment',
@@ -268,8 +275,8 @@ const APPS: AppDefinition[] = [
     defaultHeight: 400,
   },
   {
-    id: 'articles',
-    title: 'Articles',
+    id: 'settings',
+    title: 'Settings',
     icon: (
       <MessageSquare className="h-full w-full text-neutral-500 dark:text-neutral-300" />
     ),
@@ -281,7 +288,7 @@ const APPS: AppDefinition[] = [
 
 interface DesktopWindow {
   id: string; // unique instance id
-  appId: AppId;
+  appId: string;
   x: number;
   y: number;
   width: number;
@@ -345,6 +352,14 @@ export default function DashboardDesktop() {
     [windows, maxZIndex, bringToFront]
   );
 
+  // const openAppById = useCallback(
+  //   (appId: string) => {
+  //     const app = APPS.find((a) => a.id === appId);
+  //     if (app) openApp(app);
+  //   },
+  //   [openApp]
+  // );
+
   const closeWindow = useCallback((id: string) => {
     setWindows((prev) => prev.filter((w) => w.id !== id));
   }, []);
@@ -410,19 +425,20 @@ export default function DashboardDesktop() {
       }}
     >
       {/* Desktop Area */}
-      <div className="absolute inset-0 z-0">
-        {/* We could put desktop icons here if we wanted */}
-
-        {/* Camera Monitor pinned to background (optional) */}
-        <div className="absolute top-8 left-8 w-80 opacity-90 hover:opacity-100 transition-opacity">
+      {/* <div className="absolute inset-0 z-0">
+        <button
+          type="button"
+          onClick={() => openAppById('camera')}
+          className="absolute top-8 left-8 w-80 opacity-90 hover:opacity-100 transition-opacity text-left"
+        >
           <div className="rounded-xl overflow-hidden shadow-2xl border border-white/20 backdrop-blur-md">
             <div className="bg-black/40 p-2 text-white text-xs font-medium">
               Camera Feed
             </div>
             <CameraMonitor hostId="demo-host" cameraId="camera-1" />
           </div>
-        </div>
-      </div>
+        </button>
+      </div> */}
 
       {/* Windows Layer */}
       <AnimatePresence>
@@ -526,11 +542,12 @@ export default function DashboardDesktop() {
       </AnimatePresence>
 
       {/* Xyzen Side Panel (Global) */}
-      <div className="relative z-[88888]">
+      <div className="relative">
         <Xyzen
           backendUrl={
             import.meta.env.DEV ? 'http://localhost:48196' : undefined
           }
+          centeredInputPosition="bottom-right"
         />
       </div>
 
diff --git a/web/src/i18n/en-us/homepage.json b/web/src/i18n/en-us/homepage.json
@@ -1,7 +1,7 @@
 {
   "Find our latest feature update.": "Find our latest feature update. ",
   "hero": {
-    "title": "The OS for AI-Driven Labs",
+    "title": "OpenSource Kernel for AI-Driven Labs",
     "description": "ScienceOL is building the open-source operating system for the future of automated, AI-powered scientific research. Build, automate, and collaborate.",
     "button": {
       "primary": "Get Started",
diff --git a/web/vite.config.ts b/web/vite.config.ts
@@ -31,7 +31,7 @@ export default defineConfig(({ command }) => ({
       },
       workbox: {
         maximumFileSizeToCacheInBytes: 10 * 1024 * 1024, // 10 MiB
-        // 排除 /api 开头的请求，避免 Service Worker 拦截后端接口
+        // 排除 /api 和 /xyzen 开头的请求，避免 Service Worker 拦截后端接口
         navigateFallbackDenylist: [/^\/api/, /^\/xyzen/],
       },
     }),
diff --git a/web/yarn.lock b/web/yarn.lock
@@ -2661,7 +2661,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-select@npm:2.2.6":
+"@radix-ui/react-select@npm:2.2.6, @radix-ui/react-select@npm:^2.2.6":
   version: 2.2.6
   resolution: "@radix-ui/react-select@npm:2.2.6"
   dependencies:
@@ -3537,16 +3537,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sciol/xyzen@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "@sciol/xyzen@npm:0.4.1"
+"@sciol/xyzen@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "@sciol/xyzen@npm:0.4.3"
   dependencies:
     "@dnd-kit/core": "npm:^6.3.1"
     "@dnd-kit/modifiers": "npm:^9.0.0"
     "@emotion/is-prop-valid": "npm:^1.3.1"
     "@headlessui/react": "npm:^2.2.9"
     "@heroicons/react": "npm:^2.2.0"
     "@radix-ui/react-alert-dialog": "npm:^1.1.15"
+    "@radix-ui/react-select": "npm:^2.2.6"
     "@radix-ui/react-slot": "npm:^1.2.4"
     "@tabler/icons-react": "npm:^3.35.0"
     "@tailwindcss/vite": "npm:^4.1.11"
@@ -3588,7 +3589,7 @@ __metadata:
   peerDependenciesMeta:
     vite:
       optional: true
-  checksum: 10c0/b6625bbe17fb30b0516e5f553195d9181726b4e79393d9e194cea48d5716a07326451c73085dadcedd08c4c64fe8879a02d41ca104a5d42451ba1520e8566706
+  checksum: 10c0/9ca01073868ba229dea0c002c418a12007e4a695affbc77ed16e68f133223986d7723305517c6e01b0b5e2981e5d2252260ea0844d99e25cfd66b5b60f30a22e
   languageName: node
   linkType: hard
 
@@ -10640,7 +10641,7 @@ __metadata:
     "@radix-ui/react-slot": "npm:^1.2.4"
     "@react-three/drei": "npm:^10.7.6"
     "@react-three/fiber": "npm:^9.4.0"
-    "@sciol/xyzen": "npm:^0.4.1"
+    "@sciol/xyzen": "npm:^0.4.3"
     "@tabler/icons-react": "npm:^3.35.0"
     "@tailwindcss/postcss": "npm:^4.1.14"
     "@tailwindcss/vite": "npm:^4.1.14"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"Find our latest feature update.": "Find our latest feature update. ",`
`3`	`3`	`"hero": {`
`4`		`- "title": "The OS for AI-Driven Labs",`
	`4`	`+ "title": "OpenSource Kernel for AI-Driven Labs",`
`5`	`5`	`"description": "ScienceOL is building the open-source operating system for the future of automated, AI-powered scientific research. Build, automate, and collaborate.",`
`6`	`6`	`"button": {`
`7`	`7`	`"primary": "Get Started",`