Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions bridge.c
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,61 @@ void SetExecuteTimeout(JSRuntime *rt, time_t timeout) {
}
}

// ============================================================================
// DYNAMIC IMPORT (quickjs-ng v0.18.0+)
// ============================================================================

static void defaultDynamicImportHandler(JSContext *ctx, const char *basename,
const char *filename, JSValue token,
JSValueConst attributes, void *opaque) {
JSValue exception = JS_UNDEFINED;
JSValue promise;

(void)opaque;
promise = JS_LoadModule(ctx, basename, filename, attributes);
if (JS_IsException(promise)) {
exception = JS_GetException(ctx);
}
JS_FinishDynamicImport(ctx, token, promise, exception);
}

static void goDynamicImportHandler(JSContext *ctx, const char *basename,
const char *filename, JSValue token,
JSValueConst attributes, void *opaque) {
(void)opaque;
goDynamicImport(ctx, (char *)basename, (char *)filename, token, attributes);
}

void SetDefaultDynamicImportFunc(JSRuntime *rt) {
JS_SetDynamicImportFunc(rt, defaultDynamicImportHandler, NULL);
}

void SetGoDynamicImportFunc(JSRuntime *rt) {
JS_SetDynamicImportFunc(rt, goDynamicImportHandler, (void *)rt);
}

void ClearDynamicImportFunc(JSRuntime *rt) {
JS_SetDynamicImportFunc(rt, NULL, NULL);
}

int FinishDynamicImportSuccess(JSContext *ctx, JSValue token, JSValue promise) {
return JS_FinishDynamicImport(ctx, token, promise, JS_UNDEFINED);
}

int FinishDynamicImportWithError(JSContext *ctx, JSValue token, const char *message) {
JSValue exception = JS_NewError(ctx);
if (!JS_IsException(exception)) {
const char *msg = message ? message : "dynamic import failed";
JS_DefinePropertyValueStr(ctx, exception, "message",
JS_NewString(ctx, msg),
JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
JS_DefinePropertyValueStr(ctx, exception, "name",
JS_NewString(ctx, "Error"),
JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
}
return JS_FinishDynamicImport(ctx, token, JS_EXCEPTION, exception);
}

// ============================================================================
// MODULE LOADING
// ============================================================================
Expand Down
7 changes: 7 additions & 0 deletions bridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@ extern void SetExecuteTimeout(JSRuntime *rt, time_t timeout);
extern void SetPromiseRejectionTracker(JSRuntime *rt, int enabled);
extern int GetTimeoutOpaqueCount(void);

// Dynamic import (quickjs-ng v0.18.0+)
extern void SetDefaultDynamicImportFunc(JSRuntime *rt);
extern void SetGoDynamicImportFunc(JSRuntime *rt);
extern void ClearDynamicImportFunc(JSRuntime *rt);
extern int FinishDynamicImportSuccess(JSContext *ctx, JSValue token, JSValue promise);
extern int FinishDynamicImportWithError(JSContext *ctx, JSValue token, const char *message);

// =============================================================================
// MODULE-RELATED DECLARATIONS - NEW FOR MODULE BUILDER
// =============================================================================
Expand Down
49 changes: 48 additions & 1 deletion callback_dispatch.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package quickjs

import "unsafe"
import (
"errors"
"unsafe"
)

/*
#include <stdint.h>
Expand Down Expand Up @@ -48,6 +51,50 @@ func goInterruptHandler(runtimePtr *C.JSRuntime) C.int {
return C.int(runtime.callInterruptHandler())
}

//export goDynamicImport
func goDynamicImport(ctx *C.JSContext, basename *C.char, filename *C.char, token C.JSValue, attributes C.JSValueConst) {
goCtx := getContextFromJS(ctx)
if goCtx == nil || goCtx.runtime == nil {
msg := C.CString("quickjs: context not found for dynamic import")
C.FinishDynamicImportWithError(ctx, token, msg)
C.free(unsafe.Pointer(msg))
return
}

rt := goCtx.runtime
tokenVal := &Value{ctx: goCtx, ref: token}
attrsVal := &Value{ctx: goCtx, ref: C.JSValue(attributes), borrowed: true}

promise, err := rt.callDynamicImportHandler(goCtx, C.GoString(basename), C.GoString(filename), tokenVal, attrsVal)
if errors.Is(err, ErrDynamicImportPending) {
rt.registerPendingDynamicImport(goCtx, tokenVal)
return
}

if err != nil {
msg := C.CString(err.Error())
C.FinishDynamicImportWithError(ctx, tokenVal.ref, msg)
C.free(unsafe.Pointer(msg))
tokenVal.ref = C.JS_NewUndefined()
if promise != nil {
promise.Free()
}
return
}

if promise == nil || !promise.belongsTo(goCtx) {
msg := C.CString("quickjs: dynamic import handler returned nil promise")
C.FinishDynamicImportWithError(ctx, tokenVal.ref, msg)
C.free(unsafe.Pointer(msg))
tokenVal.ref = C.JS_NewUndefined()
return
}

C.FinishDynamicImportSuccess(ctx, tokenVal.ref, promise.ref)
tokenVal.ref = C.JS_NewUndefined()
promise.ref = C.JS_NewUndefined()
}

//export goFunctionProxy
func goFunctionProxy(ctx *C.JSContext, thisVal C.JSValueConst,
argc C.int, argv *C.JSValueConst, magic C.int) C.JSValue {
Expand Down
80 changes: 80 additions & 0 deletions context.go
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,86 @@ func (ctx *Context) EvalFile(filePath string, opts ...EvalOption) *Value {
return ctx.Eval(string(b), opts...)
}

// LoadModuleURL loads a module via JS_LoadModule and returns its evaluate promise.
// attributes may be nil (treated as undefined). Caller must Free the returned value.
func (ctx *Context) LoadModuleURL(basename, filename string, attributes *Value) *Value {
if !ctx.hasValidRef() {
return nil
}
if attributes != nil && !attributes.belongsTo(ctx) {
return nil
}

basePtr := C.CString(basename)
filePtr := C.CString(filename)
defer C.free(unsafe.Pointer(basePtr))
defer C.free(unsafe.Pointer(filePtr))

attrs := C.JS_NewUndefined()
if attributes != nil {
attrs = attributes.ref
}
return &Value{ctx: ctx, ref: C.JS_LoadModule(ctx.ref, basePtr, filePtr, attrs)}
}

// finishDynamicImportResultHook overrides FinishDynamicImport C return codes in tests.
var finishDynamicImportResultHook func(ret C.int) C.int

func applyFinishDynamicImportResult(ret C.int) C.int {
if hook := finishDynamicImportResultHook; hook != nil {
return hook(ret)
}
return ret
}

// FinishDynamicImport completes a previously deferred JS import().
// token ownership is consumed. On success, modulePromise ownership is consumed.
// On error, modulePromise (if any) is freed by the caller still; pass nil with err set.
func (ctx *Context) FinishDynamicImport(token *Value, modulePromise *Value, err error) error {
if ctx == nil || !ctx.hasValidRef() {
// hasValidRef also enforces owner-goroutine access.
return errors.New("quickjs: context is closed")
}
if token == nil || !token.belongsTo(ctx) || token.borrowed {
return errors.New("quickjs: invalid dynamic import token")
}

ctx.runtime.unregisterPendingDynamicImport(token)

if err != nil {
msg := C.CString(err.Error())
ret := applyFinishDynamicImportResult(C.FinishDynamicImportWithError(ctx.ref, token.ref, msg))
C.free(unsafe.Pointer(msg))
token.ref = C.JS_NewUndefined()
if modulePromise != nil {
modulePromise.Free()
}
if ret != 0 {
return errors.New("quickjs: FinishDynamicImport failed")
}
return nil
}

if modulePromise == nil || !modulePromise.belongsTo(ctx) {
msg := C.CString("quickjs: dynamic import module promise is required")
ret := applyFinishDynamicImportResult(C.FinishDynamicImportWithError(ctx.ref, token.ref, msg))
C.free(unsafe.Pointer(msg))
token.ref = C.JS_NewUndefined()
if ret != 0 {
return errors.New("quickjs: FinishDynamicImport failed")
}
return nil
}

ret := applyFinishDynamicImportResult(C.FinishDynamicImportSuccess(ctx.ref, token.ref, modulePromise.ref))
token.ref = C.JS_NewUndefined()
modulePromise.ref = C.JS_NewUndefined()
if ret != 0 {
return errors.New("quickjs: FinishDynamicImport failed")
}
return nil
}

// LoadModule returns a js value with given code and module name.
func (ctx *Context) LoadModule(code string, moduleName string, opts ...EvalOption) *Value {
options := EvalOptions{
Expand Down
34 changes: 34 additions & 0 deletions dynamic_import_test_helpers.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package quickjs

/*
#include "bridge.h"
*/
import "C"
import "unsafe"

func drainPendingJobsForTest(rt *Runtime) {
for {
var jobCtx *C.JSContext
if C.JS_ExecutePendingJob(rt.ref, &jobCtx) <= 0 {
return
}
}
}

func invokeGoDynamicImportForTest(ctx *Context, basename, filename string) {
basePtr := C.CString(basename)
filePtr := C.CString(filename)
defer C.free(unsafe.Pointer(basePtr))
defer C.free(unsafe.Pointer(filePtr))
goDynamicImport(ctx.ref, basePtr, filePtr, C.JS_NewObject(ctx.ref), C.JS_NewUndefined())
}

func forceFinishDynamicImportFailureForTest(enable bool) func() {
prev := finishDynamicImportResultHook
if enable {
finishDynamicImportResultHook = func(ret C.int) C.int { return 1 }
} else {
finishDynamicImportResultHook = nil
}
return func() { finishDynamicImportResultHook = prev }
}
Loading
Loading