sync followers ok

stream.go

@@ -39,7 +39,9 @@ func newSync(done <-chan interface{}) error {
 		return err
 	}
 
-	taskFetchStream, resTailStream := TaskImplement(done, idxStream, resStream)
+	availRes := AvailableResource(done, resStream)
+
+	taskFetchStream, resTailStream := TaskImplement(done, idxStream, availRes)
 
 	ConnectTailTask(done, connStream, taskFetchStream)
 
@@ -64,16 +66,9 @@ func TaskIdx(done <-chan interface{}, inStream <-chan taskInterface) (<-chan tas
 				return
 			case task := <-inStream:
 
-				slog.Info("TaskIdx", "task.ID()", task.ID(), "task.InitIdx()", task.InitIdx())
+				slog.Info("TaskIdx", "task.ID()", task.ID(), "task.UserName()", task.UserName(), "task.InitIdx()", task.InitIdx())
 
-				if task.InitIdx() {
-					select {
-					case <-done:
-						return
-					case outStream <- task:
-					}
-					continue
-				}
+				if !task.InitIdx() {
 
 					list, ok := task.UpdateIdx()
 
@@ -88,6 +83,13 @@ func TaskIdx(done <-chan interface{}, inStream <-chan taskInterface) (<-chan tas
 						}
 
 					}
+				}
+
+				select {
+				case <-done:
+					return
+				case outStream <- task:
+				}
 
 			}
 		}
@@ -96,18 +98,16 @@ func TaskIdx(done <-chan interface{}, inStream <-chan taskInterface) (<-chan tas
 	return outStream, outListStream
 }
 
-
-type TaskIdAndList struct{
+type TaskIdAndList struct {
 	TaskId string
 	List   *list.List
 }
 
-type TaskIdAndProfiles struct{
+type TaskIdAndProfiles struct {
 	TaskId   string
 	Profiles []Profile
 }
 
-
 func BackListToQueue(done <-chan interface{}, inStream <-chan TaskIdAndList) <-chan TaskIdAndProfiles {
 
 	outStream := make(chan TaskIdAndProfiles, 1)
@@ -177,7 +177,7 @@ func BackListToQueue(done <-chan interface{}, inStream <-chan TaskIdAndList) <-c
 	return outStream
 }
 
-func InsertOrUpdateUsers(done <-chan interface{}, inStream <-chan TaskIdAndProfiles ) error {
+func InsertOrUpdateUsers(done <-chan interface{}, inStream <-chan TaskIdAndProfiles) error {
 
 	// client, err := supabase.NewClient(API_URL, API_KEY, nil)
 	// if err != nil {
@@ -207,7 +207,7 @@ func InsertOrUpdateUsers(done <-chan interface{}, inStream <-chan TaskIdAndProfi
 					row := Follower{
 						Follower: userId,
 						UserName: user.Username,
-						UserId:users.TaskId,
+						UserId:   users.TaskId,
 					}
 					rows = append(rows, row)
 				}
@@ -301,9 +301,12 @@ func AvailableResource(done <-chan interface{}, inStream <-chan ScraperTimer) <-
 				//TODO
 				// 1. 携带web服务器的rate limit 做判断；
 				// 2. 校验 是否可用
+
+				slog.Info("AvailableResource------------------------------")
+
 				<-scraper.Timer.C
-				//scraper.Timer = *time.NewTimer(30 * time.Second)
-				scraper.Timer.Reset(30 * time.Second)
+				scraper.Timer = *time.NewTimer(60 * time.Second)
+				//scraper.Timer.Reset(30 * time.Second)
 				outStream <- scraper
 			}
 		}
@@ -331,7 +334,8 @@ func TaskImplement(done <-chan interface{}, inTaskStream <-chan taskInterface, i
 					return
 				case res := <-inResourceStream:
 
-					fmt.Println("TaskImplement", task.ID())
+					slog.Info("TaskImplement", "task.ID()", task.ID(), "task.UserName()", task.UserName(), "len(inResourceStream)", len(inResourceStream))
+
 					if err := task.Fetch(res.Scraper); err != nil {
 						slog.Error("task.Fetch", "err", err.Error())
 					}

stream_idx.go

@@ -82,8 +82,8 @@ func GetTasksIdx() ([]taskInterface, error) {
 				return nil, err
 			}
 
-			followTask := NewFollowTask()
-			followTask.UserId = task.TaskId
+			followTask := NewFollowTask(task.TaskId, task.User)
+
 			followTask.Idx = userRes
 
 			if len(userRes) == 0 {

type.go

@@ -39,7 +39,8 @@ type FollowTask struct {
 	// URL    string
 
 	Init        bool
-	UserId      string
+	UserIdStr   string
+	UserNameStr string
 	Next        string
 	Idx         []FollowerId
 	NewIdx      []FollowerId
@@ -50,16 +51,19 @@ type FollowTask struct {
 	//Scraper *twitterscraper.Scraper
 }
 
-func NewFollowTask() *FollowTask {
+func NewFollowTask(userId, userName string) *FollowTask {
 
 	return &FollowTask{
 		backPushPop: list.New(),
 		Idx:         make([]FollowerId, 0),
+		UserIdStr:   userId,
+		UserNameStr: userName,
 	}
 }
 
 type taskInterface interface {
 	ID() string
+	UserName() string
 	Fetch(scraper *twitterscraper.Scraper) error
 	InitIdx() bool
 	UpdateIdx() (*list.List, bool)
@@ -79,7 +83,11 @@ func (f *FollowTask) InitIdx() bool {
 }
 
 func (f *FollowTask) ID() string {
-	return f.UserId
+	return f.UserIdStr
+}
+
+func (f *FollowTask) UserName() string {
+	return f.UserNameStr
 }
 
 func (f *FollowTask) UpdateIdx() (*list.List, bool) {
@@ -106,6 +114,8 @@ func (f *FollowTask) UpdateIdx() (*list.List, bool) {
 		f.backPushPop.PushFront(v)
 	}
 
+	slog.Info("MatchIdx", "f.UserIdStr", f.UserIdStr, "f.UserNameStr", f.UserNameStr, "match", ok, "len(profiles)", len(profiles))
+
 	if !ok {
 		f.Next = f.Res.Next
 		return nil, false
@@ -149,7 +159,7 @@ func (f *FollowTask) Fetch(scraper *twitterscraper.Scraper) error {
 
 	// f.UserId = "OnlyDD_D"
 
-	users, newNext, err := scraper.FetchFollowersByUserID(f.UserId, 20, f.Next)
+	users, newNext, err := scraper.FetchFollowersByUserID(f.UserIdStr, 20, f.Next)
 
 	//users, newNext, err := scraper.FetchFollowers(f.UserId, 20, f.Next)
 
@@ -175,7 +185,7 @@ func (f *FollowTask) Fetch(scraper *twitterscraper.Scraper) error {
 		Next:     newNext,
 	}
 
-	slog.Info("follow fetch", "res.Current", res.Current, "res.Next", res.Next, "len(res.Profiles)", len(res.Profiles))
+	slog.Info("follow fetch", "f.UserIdStr", f.UserIdStr, "f.UserNameStr", f.UserNameStr, "res.Current", res.Current, "res.Next", res.Next, "len(res.Profiles)", len(res.Profiles))
 
 	f.Res = res
 
@@ -184,8 +194,9 @@ func (f *FollowTask) Fetch(scraper *twitterscraper.Scraper) error {
 }
 
 type RetweetTask struct {
-	URL     string
+	//URL     string
 	TweetId     string
+	UserNameStr string
 	Next        string
 	Idx         []FollowerId
 	// backPushPop = list.New()
@@ -197,6 +208,10 @@ type RetweetTask struct {
 // 	return r.URL
 // }
 
+func (f *RetweetTask) UserName() string {
+	return f.UserNameStr
+}
+
 func (f *RetweetTask) ID() string {
 	return f.TweetId
 }