Duktape: support multiple instances

src/mod_duktape.inl

@@ -10,21 +10,37 @@
 /* TODO: the mg context should be added to duktape as well */
 /* Alternative: redefine a new, clean API from scratch (instead of using mg),
  * or at least do not add problematic functions. */
+/* For evaluation purposes, currently only "send" is supported.
+ * All other ~50 functions will be added later. */
+
 /* Note: This is only experimental support, so any API may still change. */
 
 
-/* TODO: use upvalues (or whatever equivalent) */
-static struct mg_connection *xxx_conn = NULL;
+static const char *civetweb_conn_id = "civetweb_conn";
 
 
 static duk_ret_t duk_itf_send(duk_context *ctx)
 {
+	struct mg_connection *conn;
+	duk_double_t ret;
 	duk_size_t len = 0;
 	const char *val = duk_require_lstring(ctx, -1, &len);
 
-	mg_write(xxx_conn, val, len);
+	duk_push_global_stash(ctx);
+	duk_get_prop_string(ctx, -1, civetweb_conn_id);
+	conn = (struct mg_connection *)duk_to_pointer(ctx, -1);
+
+	if (!conn) {
+		duk_error(ctx,
+		          DUK_ERR_INTERNAL_ERROR,
+		          "function not available without connection object");
+		/* probably never reached, but satisfies static code analysis */
+		return DUK_RET_INTERNAL_ERROR;
+	}
+
+	ret = mg_write(conn, val, len);
 
-	duk_push_true(ctx);
+	duk_push_number(ctx, ret);
 	return 1;
 }
 
@@ -45,7 +61,9 @@ static void mg_exec_duktape_script(struct mg_connection *conn, const char *path)
 	duk_push_c_function(ctx, duk_itf_send, 1 /*nargs*/);
 	duk_put_prop_string(ctx, -2, "send");
 
-	xxx_conn = conn;
+	duk_push_global_stash(ctx);
+	duk_push_pointer(ctx, (void *)conn);
+	duk_put_prop_string(ctx, -2, civetweb_conn_id);
 
 	if (duk_peval_file(ctx, path) != 0) {
 		mg_cry(conn, "%s", duk_safe_to_string(ctx, -1));