Merge branch 'master' of github.com:ceramic/ceramic

Conflicts: src/ceramic.lisp
ceramic · Aug 9, 2015 · fb563ad · fb563ad
2 parents 79a55ae + 37814a1
commit fb563ad
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 26 deletions.
diff --git a/examples/ipc-example/files/scripts.js b/examples/ipc-example/files/scripts.js
@@ -6,4 +6,8 @@ document.addEventListener("DOMContentLoaded", function(event) {
   node.onclick = function() {
     ipc.send('ceramic-channel', { text: 'Clicked button' });
   };
+
+  ipc.on('ceramic-channel', function(event, msg) {
+    console.log(msg);
+  });
 });
diff --git a/examples/ipc-example/ipc-example.lisp b/examples/ipc-example/ipc-example.lisp
@@ -31,16 +31,23 @@
 (defview hello ()
   (render-template (+index+)))
 
-(defvar *port* 8000)
+(defvar *port* 8001)
+
+(defvar *window*)
 
 (setf ceramic:*event-dispatcher*
       (lambda (event)
-        (format t "Got event! ~A~%" event)))
+        (let ((event-type (getf event :|event|)))
+          (format t "Got event of type ~S~%" event-type)
+          (when (string= event-type "async")
+            (ceramic:send-message *window*
+                                  (list (cons "text" "received!")))))))
 
 (defun run ()
-  (let ((window (ceramic:make-window :url (format nil "http://localhost:~D/" *port*))))
-    (ceramic:show-window window)
+  (let ((*window* (ceramic:make-window :url (format nil "http://localhost:~D/" *port*))))
     (start app :port *port*)
+    (ceramic:show-window *window*)
+    (ceramic:open-dev-tools *window*)
     (ceramic::dispatch-events)))
 
 (ceramic:define-entry-point :ceramic-hello-world ()

diff --git a/src/ceramic.lisp b/src/ceramic.lisp
@@ -33,6 +33,7 @@
            :hide-window
            :close-window
            :destroy-window
+           :send-message
            :maximize-window
            :unmaximize-window
            :minimize-window
@@ -70,7 +71,7 @@
                                               :operating-system *operating-system*))
         t)))
 
-+(defun stop-interactive ()
+(defun stop-interactive ()
   "Stop the interactive process."
   (handler-case
       (ceramic.electron:quit *process*)
@@ -245,6 +246,12 @@
   (call-with-defaults ceramic.electron:destroy-window
                       window))
 
+(defmethod send-message ((window window) message)
+  "Send an alist message to the window."
+  (call-with-defaults ceramic.electron:send-message
+                      window
+                      message))
+
 (defmethod maximize-window ((window window))
   "Maximize the window."
   (call-with-defaults ceramic.electron:maximize-window

diff --git a/src/electron/driver.lisp b/src/electron/driver.lisp
@@ -25,6 +25,7 @@
   (:export :create-window
            :close-window
            :destroy-window
+           :send-message
            :show-window
            :hide-window
            :resize-window
@@ -94,6 +95,9 @@
 (define-window-command destroy-window "destroy-window" ()
   ())
 
+(define-window-command send-message "send-message-to-window" (message)
+  message)
+
 (define-window-command show-window "show-window" ()
   ())
 

diff --git a/src/electron/main.js b/src/electron/main.js
@@ -21,6 +21,16 @@ function eventIPC(message) {
   writeEvent({ "event": "async", "msg": message });
 };
 
+/* IPC */
+
+const CHANNEL = 'ceramic-channel';
+
+ipc.on(CHANNEL, function(event, object) {
+  /* When receiving an asynchronous message, we write it to stdout as an async
+     event. */
+  eventIPC(object);
+});
+
 /* Commands */
 
 // Windows
@@ -44,6 +54,12 @@ function windowDestroy(name) {
   window_db[name].destroy();
 };
 
+//// IPC
+
+function windowSendMessage(name, message) {
+  window_db[name].webContents.send(CHANNEL, message);
+};
+
 //// Display
 
 function windowShow(name) {
@@ -186,6 +202,9 @@ const dispatcher = {
   'destroy-window': function(data) {
     windowDestroy(data['name']);
   },
+  'send-message-to-window': function(data) {
+    windowSendMessage(data['name'], data['message']);
+  },
   //// Display
   'show-window': function(data) {
     windowShow(data['name']);
@@ -278,14 +297,6 @@ function dispatchCommand(data) {
   dispatcher[command](data);
 };
 
-/* IPC */
-
-ipc.on('ceramic-channel', function(event, object) {
-  /* When receiving an asynchronous message, we write it to stdout as an async
-     event. */
-  eventIPC(object);
-});
-
 /* Start up */
 
 app.on('ready', function() {

diff --git a/t/integration.lisp b/t/integration.lisp
@@ -65,19 +65,7 @@
     (is
      (equal (ceramic.resource:resource 'ceramic-test-app::files #p"file.txt")
             (asdf:system-relative-pathname :ceramic-test-app
-                                           #p"files/file.txt")))
-    ;; Run the app
-    (let* ((process (external-program:start (namestring binary) (list)
-                                            :output :stream))
-           (stdout (external-program:process-output-stream process)))
-      (sleep 0.1)
-      (is
-       (equal (read-line stdout) "T"))
-      (is
-       (equal (read-line stdout)
-              (namestring
-               (merge-pathnames #p"resources/files/file.txt"
-                                *extraction-directory*)))))))
+                                           #p"files/file.txt")))))
 
 (test cleanup
   (uiop:delete-directory-tree *extraction-directory* :validate t))