fix for edge cases

Author: noel2004

coordinator/internal/controller/proxy/client.go

@@ -71,7 +71,7 @@ func (c *upClient) Login(ctx context.Context, genLogin func(string) (*types.Logi
 	// Step 1: Get challenge
 	url := fmt.Sprintf("%s/coordinator/v1/challenge", c.baseURL)
 
-	req, err := http.NewRequest("GET", url, nil)
+	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create challenge request: %w", err)
 	}
@@ -107,7 +107,7 @@ func (c *upClient) Login(ctx context.Context, genLogin func(string) (*types.Logi
 		return nil, fmt.Errorf("failed to marshal login parameter: %w", err)
 	}
 
-	req, err = http.NewRequest("POST", url, bytes.NewBuffer(jsonData))
+	req, err = http.NewRequestWithContext(ctx, "POST", url, bytes.NewBuffer(jsonData))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create login request: %w", err)
 	}

coordinator/internal/controller/proxy/get_task.go

@@ -145,8 +145,9 @@ func (ptc *GetTaskController) GetTasks(ctx *gin.Context) {
 
 	session := ptc.proverMgr.Get(publicKey)
 	if session == nil {
-		nerr := fmt.Errorf("can not get session for prover %s", proverName)
-		types.RenderFailure(ctx, types.InternalServerError, nerr)
+		nerr := fmt.Errorf("Trigger re-login: can not get session for prover %s", proverName)
+		// has to trigger a login in proving-sdk side with ErrJWTTokenExpired error
+		types.RenderFailure(ctx, types.ErrJWTTokenExpired, nerr)
 		return
 	}
 

coordinator/internal/controller/proxy/prover_session.go

@@ -49,7 +49,7 @@ func (m *ProverManager) Get(userKey string) (ret *proverSession) {
 			if err != nil {
 				log.Error("Get persistent layer for prover tokens fail", "error", err)
 			} else if ret != nil {
-				log.Debug("restore record from persistent", "key", userKey, "token", ret.proverToken)
+				log.Debug("restore record from persistent", "key", userKey)
 				ret.persistent = m.persistent
 			}
 		}
@@ -161,8 +161,8 @@ func (c *proverSession) maintainLogin(ctx context.Context, cliMgr Client, up str
 		return
 	}
 
-	if resp.ErrCode == ctypes.ErrJWTTokenExpired {
-		log.Info("up stream has expired, renew upstream connection", "up", up)
+	if resp.ErrCode == ctypes.ErrJWTTokenExpired || resp.ErrCode == ctypes.ErrJWTCommonErr {
+		log.Info("up stream has expired, renew upstream connection", "up", up, "errcode", resp.ErrCode)
 		cli.Reset()
 		cli = cliMgr.ClientAsProxy(ctx)
 		if cli == nil {
@@ -231,9 +231,10 @@ func (c *proverSession) GetTask(ctx context.Context, param *types.GetTaskParamet
 		if err != nil {
 			return nil, err
 		}
-		if resp.ErrCode != ctypes.ErrJWTTokenExpired {
+		if resp.ErrCode != ctypes.ErrJWTTokenExpired && resp.ErrCode != ctypes.ErrJWTCommonErr {
 			return resp, nil
 		}
+		log.Debug("Get Task first-try failed for broken token", "up", up, "errcode", resp.ErrCode)
 	}
 
 	// like SDK, we would try one more time if the upstream token is expired
@@ -264,9 +265,10 @@ func (c *proverSession) SubmitProof(ctx context.Context, param *types.SubmitProo
 		if err != nil {
 			return nil, err
 		}
-		if resp.ErrCode != ctypes.ErrJWTTokenExpired {
+		if resp.ErrCode != ctypes.ErrJWTTokenExpired && resp.ErrCode != ctypes.ErrJWTCommonErr {
 			return resp, nil
 		}
+		log.Debug("Get Task first-try failed for broken token", "up", up, "errcode", resp.ErrCode)
 	}
 
 	// like SDK, we would try one more time if the upstream token is expired

coordinator/internal/controller/proxy/submit_proof.go

@@ -59,8 +59,9 @@ func (spc *SubmitProofController) SubmitProof(ctx *gin.Context) {
 
 	session := spc.proverMgr.Get(publicKey)
 	if session == nil {
-		nerr := fmt.Errorf("can not get session for prover %s", proverName)
-		types.RenderFailure(ctx, types.InternalServerError, nerr)
+		nerr := fmt.Errorf("Trigger re-login: can not get session for prover %s", proverName)
+		// has to trigger a login in proving-sdk side with ErrJWTTokenExpired error
+		types.RenderFailure(ctx, types.ErrJWTTokenExpired, nerr)
 		return
 	}