lem-server: change js-eval to return the result of evaluation

lem-project · Oct 22, 2024 · 9fd0c46 · 9fd0c46
1 parent 9da6793
commit 9fd0c46
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 16 deletions.
diff --git a/...er/frontend/dist/assets/index-DkE9_tVc.js → ...er/frontend/dist/assets/index-B5dt4B6H.js b/...er/frontend/dist/assets/index-DkE9_tVc.js → ...er/frontend/dist/assets/index-B5dt4B6H.js
diff --git a/frontends/server/frontend/dist/index.html b/frontends/server/frontend/dist/index.html
@@ -15,7 +15,7 @@
 }
 
     </style>
-    <script type="module" crossorigin src="/assets/index-DkE9_tVc.js"></script>
+    <script type="module" crossorigin src="/assets/index-B5dt4B6H.js"></script>
   </head>
   <body>
     <div id='lem-editor'></div>

diff --git a/frontends/server/frontend/editor.js b/frontends/server/frontend/editor.js
@@ -292,7 +292,7 @@ class BaseSurface {
   }
 
   evalIn(code) {
-    eval(code);
+    return eval(code);
   }
 }
 
@@ -438,7 +438,7 @@ class HTMLSurface extends BaseSurface {
   }
 
   evalIn(code) {
-    this.iframe.contentWindow.eval(code);
+    return this.iframe.contentWindow.eval(code);
   }
 }
 
@@ -707,7 +707,7 @@ class View {
   }
 
   evalIn(code) {
-    this.mainSurface.evalIn(code);
+    return this.mainSurface.evalIn(code);
   }
 }
 
@@ -1205,6 +1205,10 @@ export class Editor {
 
   jsEval({ viewInfo: { id }, code }) {
     const view = this.findViewById(id);
-    view.evalIn(code);
+    const result = view.evalIn(code);
+    if (result) {
+      return result.toString();
+    }
+    return result;
   }
 }
diff --git a/frontends/server/main.lisp b/frontends/server/main.lisp
@@ -336,11 +336,34 @@
   ;; TODO
   1)
 
-(defmethod lem-if:js-eval ((jsonrpc jsonrpc) view code)
-  (notify (lem:implementation)
-          "js-eval"
-          (hash "viewInfo" view
-                "code" code)))
+(defmethod lem-if:js-eval ((jsonrpc jsonrpc) view code &key wait)
+  (let ((params (hash "viewInfo" view "code" code)))
+    (if wait
+        (let ((mailbox (sb-concurrency:make-mailbox :name "js-eval-mailbox")))
+          (apply #'values
+                 (loop :for connection
+                       :in (jsonrpc/server::server-client-connections
+                            (jsonrpc-server (lem:implementation)))
+                       :do (jsonrpc:call-async-to
+                            (jsonrpc-server (lem:implementation))
+                            connection
+                            "js-eval"
+                            params
+                            (lambda (res)
+                              (sb-concurrency:send-message mailbox (list t res)))
+                            (lambda (message code)
+                              (sb-concurrency:send-message
+                               mailbox
+                               (list nil
+                                     (make-condition 'jsonrpc/errors:jsonrpc-callback-error
+                                                     :message message
+                                                     :code code)))))))
+          (destructuring-bind (ok value)
+              (sb-concurrency:receive-message mailbox)
+            (if ok
+                value
+                (error value))))
+        (notify (lem:implementation) "js-eval" params))))
 
 (lem:add-hook lem:*switch-to-buffer-hook* 'on-switch-to-buffer)
 

diff --git a/src/html-buffer.lisp b/src/html-buffer.lisp
@@ -18,7 +18,8 @@
     (change-class buffer 'html-buffer :html html)
     buffer))
 
-(defun js-eval (window code)
+(defun js-eval (window code &key (wait nil))
   (lem-if:js-eval (implementation)
                   (window-view window)
-                  code))
+                  code
+                  :wait wait))
diff --git a/src/interface.lisp b/src/interface.lisp
@@ -117,9 +117,10 @@
 (defgeneric lem-if:object-height (implementation drawing-object))
 (defgeneric lem-if:clear-to-end-of-window (implementation view y))
 
-(defgeneric lem-if:js-eval (implementation view code)
-  (:method (implementation view code)
-   (error "unimplemented")))
+(defgeneric lem-if:js-eval (implementation view code &key wait)
+  (:method (implementation view code &key wait)
+    (declare (ignore wait))
+    (error "unimplemented")))
 
 (defvar *display-background-mode* nil)