type system

Author: dunglas

frankenphp.go

@@ -39,7 +39,6 @@ import (
 	//_ "github.com/ianlancetaylor/cgosymbolizer"
 
 	"github.com/dunglas/mercure"
-	"go.uber.org/zap"
 )
 
 type contextKeyStruct struct{}
@@ -578,7 +577,7 @@ func go_is_context_done(threadIndex C.uintptr_t) C.bool {
 }
 
 //export go_mercure_publish
-func go_mercure_publish(threadIndex C.uintptr_t, topics unsafe.Pointer, data unsafe.Pointer, private bool, id, typ unsafe.Pointer, retry uint64) (generatedID *C.zend_string, error C.short) {
+func go_mercure_publish(threadIndex C.uintptr_t, topics *C.struct__zval_struct, data unsafe.Pointer, private bool, id, typ unsafe.Pointer, retry uint64) (generatedID *C.zend_string, error C.short) {
 	fc := phpThreads[threadIndex].getRequestContext()
 
 	if fc.mercureHub == nil {
@@ -597,19 +596,26 @@ func go_mercure_publish(threadIndex C.uintptr_t, topics unsafe.Pointer, data uns
 		Private: private,
 	}
 
-	ts := GoValue[string](topics)
-	switch t := ts.(type) {
-	case string:
-		u.Topics = []string{t}
-	case []string:
-		u.Topics = t
+	zvalType := C.zval_get_type(topics)
+	switch zvalType {
+	case C.IS_STRING:
+		u.Topics = []string{GoString(unsafe.Pointer(topics))}
+	case C.IS_ARRAY:
+		ts, err := GoPackedArray[string](unsafe.Pointer(topics))
+		if err != nil {
+			logger.Error("invalid topics type", slog.String("error", err.Error()))
+
+			return nil, 1
+		}
+
+		u.Topics = ts
 	default:
 		// Never happens as the function is called from C with proper types
-		panic(fmt.Sprintf("invalid topics type %#v", t))
+		panic("invalid topics type")
 	}
 
 	if err := fc.mercureHub.Publish(u); err != nil {
-		logger.Error("Unable to publish Mercure update", zap.Error(err))
+		logger.Error("Unable to publish Mercure update", slog.String("error", err.Error()))
 
 		return nil, 2
 	}

frankenphp_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: cd534a8394f535a600bf45a333955d23b5154756 */
+ * Stub hash: fcc86e17663887b089b79144e10ab3ca50ce3faa */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_handle_request, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
@@ -27,7 +27,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_apache_response_headers arginfo_frankenphp_response_headers
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mercure_publish, 0, 1, IS_STRING, 0)
-	ZEND_ARG_TYPE_MASK(0, topics, MAY_BE_STRING|MAY_BE_ARRAY, NULL)
+	ZEND_ARG_INFO(0, topics)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, data, IS_STRING, 0, "\'\'")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, private, _IS_BOOL, 0, "false")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, id, IS_STRING, 1, "null")

threadworker.go

@@ -4,6 +4,7 @@ package frankenphp
 import "C"
 import (
 	"context"
+	"fmt"
 	"log/slog"
 	"path/filepath"
 	"time"
@@ -245,7 +246,12 @@ func go_frankenphp_finish_worker_request(threadIndex C.uintptr_t, retval *C.zval
 	thread := phpThreads[threadIndex]
 	fc := thread.getRequestContext()
 	if retval != nil {
-		fc.handlerReturn = GoValue[any](unsafe.Pointer(retval))
+		r, err := GoValue[any](unsafe.Pointer(retval))
+		if err != nil {
+			logger.Error(fmt.Sprintf("cannot convert return value: %s", err))
+		}
+
+		fc.handlerReturn = r
 	}
 
 	fc.closeContext()