Merge pull request #86 from singchia/fix/hijack_panic

fix: hijack panic while pattern not set
singchia · Feb 25, 2024 · 0cb6819 · 0cb6819
2 parents 3842313 + 57d2d8a
commit 0cb6819
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/application/rpc.go b/application/rpc.go
@@ -206,7 +206,9 @@ func (sm *stream) CallAsync(ctx context.Context, method string, req geminio.Requ
 }
 
 func (sm *stream) Hijack(rpc geminio.HijackRPC, opts ...*options.HijackOptions) error {
-	pRPC := &patternRPC{}
+	pRPC := &patternRPC{
+		match: true,
+	}
 	fo := options.MergeHijackOptions(opts...)
 	if fo.Pattern != nil {
 		reg, err := regexp.Compile(*fo.Pattern)

diff --git a/application/stream.go b/application/stream.go
@@ -292,6 +292,10 @@ func (sm *stream) handleInRequestPacket(pkt *packet.RequestPacket) iodefine.IORe
 	}
 	// hijack exist
 	if sm.hijackRPC != nil {
+		if sm.hijackRPC.pattern == nil {
+			sm.doRPC(pkt, methodRPC(sm.hijackRPC.rpc), method, ctx, req, rsp, true)
+			return iodefine.IOSuccess
+		}
 		matched := sm.hijackRPC.pattern.Match([]byte(method))
 		if (sm.hijackRPC.match && matched) || (!sm.hijackRPC.match && !matched) {
 			// do RPC and cancel the context