feat: add bundle des for web

aoliaoaoaojiao · Oct 16, 2022 · 77bc54a · 77bc54a
1 parent ccc82cd
commit 77bc54a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/entity/wirMessage.go b/src/entity/wirMessage.go
@@ -115,3 +115,10 @@ type UrlItem struct {
 	WebSocketDebuggerUrl string  `json:"webSocketDebuggerUrl"`
 	DevtoolsFrontendUrl  string  `json:"devtoolsFrontendUrl"`
 }
+
+type BundleItem struct {
+	PID      string    `json:"pid,omitempty"`
+	BundleId string    `json:"bundleId,omitempty"`
+	Name     string    `json:"name,omitempty"`
+	Pages    []UrlItem `json:"pages,omitempty"`
+}
diff --git a/src/webinspector/webkitDebugService.go b/src/webinspector/webkitDebugService.go
@@ -172,10 +172,17 @@ func (w *WebkitDebugService) FindPagesByID(pageId string) (application *entity.W
 	return nil, nil, fmt.Errorf("not find page")
 }
 
-func (w *WebkitDebugService) GetOpenPages(port int) ([]entity.UrlItem, error) {
+func (w *WebkitDebugService) GetOpenPages(port int) ([]entity.BundleItem, error) {
 	var wg = sync.WaitGroup{}
-	for key, _ := range w.connectedApplication {
+	var result []entity.BundleItem
+	for key, app := range w.connectedApplication {
 		wg.Add(1)
+		var bundleItem = &entity.BundleItem{
+			BundleId: *app.ApplicationBundle,
+			Name:     *app.ApplicationName,
+			PID:      *app.ApplicationID,
+		}
+		result = append(result, *bundleItem)
 		go func(key string) {
 			err := w.rpcService.SendForwardGetListing(&w.connectID, &key)
 			if err != nil {
@@ -185,8 +192,8 @@ func (w *WebkitDebugService) GetOpenPages(port int) ([]entity.UrlItem, error) {
 		}(key)
 	}
 	wg.Wait()
-	var pages []entity.UrlItem
 	for appID, _ := range w.applicationPages {
+		var pages []entity.UrlItem
 		for pageID, page := range w.applicationPages[appID] {
 			//if page.PageType != entity.WEB && page.PageType != entity.WEB_PAGE {
 			//	continue
@@ -202,8 +209,14 @@ func (w *WebkitDebugService) GetOpenPages(port int) ([]entity.UrlItem, error) {
 			}
 			pages = append(pages, *pageItem)
 		}
+		for k, v := range result {
+			if v.PID == appID {
+				result[k].Pages = pages
+				break
+			}
+		}
 	}
-	return pages, nil
+	return result, nil
 }
 
 func (w *WebkitDebugService) sendWebkitProtocolCommand(applicationID *string, pageID *int, message []byte) {