isomorfeus-asset-manager 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7162fb3d5c939906f313a318d584172442701208252f8aafc0eebedcf0c4ad9c
-  data.tar.gz: dc71e81701d13ecf72da6e55804dc71a20b9ddc4cbb13deac91c361015f7571f
+  metadata.gz: 118c1d13be80aba5339ecc42d8af01d22b1aa97ac929b8eb7915638ce28a3449
+  data.tar.gz: 8828cc73dc59ad93686d0e5c50a5df9da7ba25b9a1e8925537ce04b8bd359df3
 SHA512:
-  metadata.gz: bbe144c2ef38e4c50ea177ce6a186c05c2dbe80d1dd168f8d2c39c3526b7a7b37219e84ebb051c31f08f0555dbd996463b3ab6a08e093d20b3bbee89e8550cf4
-  data.tar.gz: 20fcde6cd21f5d9c280e7b359151f2d4eb61a629ef85c93258fb0872c9c71cf283e16493d30ba14eb9d25e6d642026347896fa82ced73a444c42bfd8372e5996
+  metadata.gz: 3e8c8ebec132650ef035c830ee3dcf5caecf9a22cd7674c9cacc1ac673e66b2c75e29b4f414c2222d1fc25cbfc4609e3ab6ccb8f8806d3b4e2cd6aa7a3fd568f
+  data.tar.gz: 64de09f406887a737cfd1dc3e976cd4b911acf49cc92e2b64ce24cad185994b1b49ba05f51a5783230a61401d3f5cbab687b4c661f6a16ab4b348aa4c2b22b2d

data/lib/isomorfeus/asset_manager/asset.rb

@@ -63,6 +63,31 @@ module Isomorfeus
         end
         js << "\n" if !@js_imports.empty? && !@ruby_imports.empty?
         unless @ruby_imports.empty?
+          if Isomorfeus.development? && @target == :browser
+            js << <<~JAVASCRIPT
+            // Isomorfeus Asset Manager HMR code begin
+            let ws_protocol = (window.location.protocol == 'https:') ? 'wss:' : 'ws:';
+            let ws_url = ws_protocol + '//' + window.location.host + "#{Isomorfeus.assets_websocket_path}";
+            let hmr_ws = new WebSocket(ws_url);
+            hmr_ws.onmessage = function(event) {
+              let update = JSON.parse(event.data);
+              if (typeof update.error !== 'undefined') { console.error(update.error); return; }
+              let start_index = '/* Generated by Opal 1.2.0 */\\nOpal.modules[\\"'.length;
+              let end_index = update.javascript.indexOf('"', start_index);
+              let opal_module_name = update.javascript.substr(start_index, end_index - start_index);
+              console.log('Updating ', opal_module_name);
+              if (typeof Opal !== 'undefined' && typeof Opal.require_table !== "undefined" && Opal.require_table['corelib/module']) {
+                try {
+                  eval(update.javascript);
+                  if (Opal.require_table[opal_module_name]) { Opal.load.call(Opal, opal_module_name); } 
+                  else { Opal.require.call(Opal, opal_module_name); }
+                  Opal.Isomorfeus.$force_render();
+                } catch (e) { console.error(e); return; }
+              }
+            }
+            // Isomorfeus Asset Manager HMR code end
+            JAVASCRIPT
+          end
           js << "#{@ruby_imports.map(&:to_s).join("\n")}"
         end
         js

data/lib/isomorfeus/asset_manager/config.rb

@@ -1,18 +1,19 @@
 module Isomorfeus
   # available settings
   if RUBY_ENGINE == 'opal'
-    add_client_option(:assets_websocket_path)
     add_client_option(:assets_path)
-    add_client_option(:opal_assets_path)
   else
     class << self
       attr_reader :env
       attr_accessor :root
       attr_accessor :app_root
       attr_accessor :assets_path
+      attr_accessor :assets_websocket_path 
       attr_accessor :asset_manager_tmpdir
+      attr_accessor :asset_manager_hmr_channel
       attr_accessor :node_paths
       attr_accessor :assets
+      attr_accessor :hmr_listener
 
       def add_web_js_import(*args)
         Isomorfeus.assets['web.js'].add_js_import(*args)
@@ -62,6 +63,9 @@ module Isomorfeus
     end
   end
 
+  self.hmr_listener = nil
+  self.asset_manager_hmr_channel = :isomorfeus_asset_manager_module_updates
+  self.assets_websocket_path = '/_assets_websocket'
   self.assets_path = '/assets'
   self.assets = {
     'web.js' => Isomorfeus::AssetManager::Asset.new(:browser),

data/lib/isomorfeus/asset_manager/rack_middleware.rb

@@ -3,10 +3,11 @@
 module Isomorfeus
   class AssetManager
     class RackMiddleware
-      WS_RESPONSE = [0, {}, []]
+      WS_RESPONSE = [0, {}, []].freeze
       attr_reader :asset_manager
 
       def initialize(app)
+        STDERR.puts "asset manager"
         @app = app
         @asset_manager = Isomorfeus::AssetManager.new
         @compressible_types = %w[application/javascript text/javascript]
@@ -17,60 +18,63 @@ module Isomorfeus
           @assets_path = Isomorfeus.assets_path + '/'
           @assets_path_size = @assets_path.size
         end
+      rescue Exception => e
+        STDERR.puts "#{e.message}\n#{e.backtrace.join("\n")}\n"
       end
 
       def call(env)
-        begin
-          path_info = env['PATH_INFO']
-          if path_info.start_with?(@assets_path)
-            asset_key = path_info[@assets_path_size..-1]
+        path_info = env['PATH_INFO']
+        if path_info.start_with?(@assets_path)
+          asset_key = path_info[@assets_path_size..-1]
 
-            # get js
-            if Isomorfeus.assets.key?(asset_key)
-              asset = Isomorfeus.assets[asset_key]
-              if asset && asset.target != :node
-                asset_manager.transition(asset_key, asset)
-                headers = {}
-                headers['Last-Modified'] = asset.mtime
-                headers[Rack::CONTENT_TYPE] = 'application/javascript'
-                if should_gzip?(env)
-                  headers['Content-Encoding'] = "gzip"
-                  headers[Rack::CONTENT_LENGTH] = asset.bundle_gz_size
-                  return [200, headers, asset.bundle_gz]
-                else
-                  headers[Rack::CONTENT_LENGTH] = asset.bundle_size
-                  return [200, {}, asset.bundle]
-                end              
-              end
-            
-            # get source map
-            elsif asset_key.end_with?('.js.map')
-              asset = Isomorfeus.assets[asset_key[0..-5]]
-              if asset && asset.target != :node
-                asset_manager.transition(asset_key, asset) unless asset.bundled?
-                headers = {}
-                headers['Last-Modified'] = asset.mtime
-                headers[Rack::CONTENT_TYPE] = 'application/json'
-                if should_gzip?(env)
-                  headers['Content-Encoding'] = "gzip"
-                  headers[Rack::CONTENT_LENGTH] = asset.bundle_map_gz.size
-                  return [200, headers, asset.bundle_map_gz]
-                else
-                  headers[Rack::CONTENT_LENGTH] = asset.bundle_map.size
-                  return [200, {}, asset.bundle_map]
-                end 
-              end
+          # get js
+          if Isomorfeus.assets.key?(asset_key)
+            asset = Isomorfeus.assets[asset_key]
+            if asset && asset.target != :node
+              asset_manager.transition(asset_key, asset)
+              headers = {}
+              headers['Last-Modified'] = asset.mtime
+              headers[Rack::CONTENT_TYPE] = 'application/javascript'
+              if should_gzip?(env)
+                headers['Content-Encoding'] = "gzip"
+                headers[Rack::CONTENT_LENGTH] = asset.bundle_gz_size
+                return [200, headers, asset.bundle_gz]
+              else
+                headers[Rack::CONTENT_LENGTH] = asset.bundle_size
+                return [200, {}, asset.bundle]
+              end              
             end
-            # elsif Isomorfeus.development? && path_info == Isomorfeus.api_asset_hmr_socket_path
-            #   if env['rack.upgrade?'] == :websocket
-            #     env['rack.upgrade'] = Isomorfeus::AssetManager::ServerSocketProcessor.new
-            #   end
-            #   WS_RESPONSE
+          
+          # get source map
+          elsif asset_key.end_with?('.js.map')
+            asset = Isomorfeus.assets[asset_key[0..-5]]
+            if asset && asset.target != :node
+              asset_manager.transition(asset_key, asset) unless asset.bundled?
+              headers = {}
+              headers['Last-Modified'] = asset.mtime
+              headers[Rack::CONTENT_TYPE] = 'application/json'
+              if should_gzip?(env)
+                headers['Content-Encoding'] = "gzip"
+                headers[Rack::CONTENT_LENGTH] = asset.bundle_map_gz.size
+                return [200, headers, asset.bundle_map_gz]
+              else
+                headers[Rack::CONTENT_LENGTH] = asset.bundle_map.size
+                return [200, {}, asset.bundle_map]
+              end 
+            end
+          end
+
+        # hot reloading subscription
+        elsif Isomorfeus.development? && path_info == Isomorfeus.assets_websocket_path
+          if env['rack.upgrade?'] == :websocket
+            env['rack.upgrade'] = Isomorfeus::AssetManager::ServerSocketProcessor.new
           end
-        rescue Exception => e
-          STDERR.puts "#{e}\n#{e.backtrace.join("\n")}"
+          WS_RESPONSE
+        else
           @app.call(env)
         end
+      rescue Exception => e
+        STDERR.puts "#{e.message}\n#{e.backtrace.join("\n")}\n"
         @app.call(env)
       end
 

data/lib/isomorfeus/asset_manager/server_socket_processor.rb

@@ -1,55 +1,21 @@
-module Isomorfeus
-  class AssetManager
-    class ServerSocketProcessor
-      # include Isomorfeus::Transport::ServerProcessor
-
-      # def on_message(client, data)
-      #   # TODO
-      #   if Isomorfeus.development?
-      #     write_lock = Isomorfeus.zeitwerk_lock.try_write_lock
-      #     if write_lock
-      #       Isomorfeus.zeitwerk.reload
-      #       Isomorfeus.zeitwerk_lock.release_write_lock
-      #     end
-      #     Isomorfeus.zeitwerk_lock.acquire_read_lock
-      #   end
-      #   request_hash = Oj.load(data, mode: :strict)
-      #   handler_instance_cache = {}
-      #   response_agent_array = []
-      #   Thread.current[:isomorfeus_user] = user(client)
-      #   Thread.current[:isomorfeus_pub_sub_client] = client
-      #   process_request(request_hash, handler_instance_cache, response_agent_array)
-      #   handler_instance_cache.each_value do |handler|
-      #     handler.resolve if handler.resolving?
-      #   end
-      #   result = {}
-      #   response_agent_array.each do |response_agent|
-      #     result.deep_merge!(response_agent.result)
-      #   end
-      #   client.write Oj.dump(result, mode: :strict) unless result.empty?
-      # ensure
-      #   Thread.current[:isomorfeus_user] = nil
-      #   Thread.current[:isomorfeus_pub_sub_client] = nil
-      #   Isomorfeus.zeitwerk_lock.release_read_lock if Isomorfeus.development?
-      # end
-
-      # def on_close(client)
-      #   # nothing for now
-      # end
-
-      # def on_open(client)
-      #   # nothing for now
-      # end
-
-      # def on_shutdown(client)
-      #   # nothing for now
-      # end
-
-      # def user(client)
-      #   current_user = client.instance_variable_get(:@isomorfeus_user)
-      #   return current_user if current_user
-      #   Anonymous.new
-      # end
-    end
-  end
-end
+module Isomorfeus
+  class AssetManager
+    class ServerSocketProcessor
+      def on_message(client, data)
+        # nothing for now
+      end
+
+      def on_close(client)
+        # client.unsubscribe Isomorfeus.asset_manager_hmr_channel
+      end
+
+      def on_open(client)
+        client.subscribe Isomorfeus.asset_manager_hmr_channel
+      end
+
+      def on_shutdown(client)
+        # nothing for now
+      end
+    end
+  end
+end

data/lib/isomorfeus/asset_manager/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   class AssetManager
-    VERSION = '0.12.4'
+    VERSION = '0.12.5'
   end
 end

data/lib/isomorfeus/asset_manager.rb

@@ -20,6 +20,8 @@ module Isomorfeus
         ssr_imports_file = File.join(imports_path, 'ssr.js')
         Isomorfeus.add_ssr_js_import(ssr_imports_file) if File.exist?(ssr_imports_file)
       end
+
+      init_hmr_listener if Isomorfeus.development? && !Isomorfeus.hmr_listener
     end
   
     def transition(asset_key, asset, analyze: false)
@@ -27,7 +29,7 @@ module Isomorfeus
       asset.mutex.synchronize do
         return if !Isomorfeus.development? && asset.bundled?
         asset.touch
-        compile_ruby_and_save(asset_key, asset)
+        build_ruby_and_save(asset_key, asset)
         save_imports(asset_key, asset)
         run_esbuild(asset_key, asset, analyze)
         asset.bundle = bundled_asset(asset_key)
@@ -49,7 +51,7 @@ module Isomorfeus
       File.write(File.join(@imports_path, asset_key), asset.to_s)
     end
 
-    def compile_ruby_and_save(asset_key, asset)
+    def build_ruby_and_save(asset_key, asset)
       asset.ruby_imports.each do |ruby_import|
         out_file = File.join(@imports_path, ruby_import.module_name + '.js')
         next if !Isomorfeus.development? && File.exist?(out_file)
@@ -65,6 +67,13 @@ module Isomorfeus
       end
     end
 
+    def compile_ruby(file)
+      source = File.read(file)
+      module_file = file[(Isomorfeus.app_root.size + 1)..-1]
+      compiler = Opal::Compiler.new(source, requirable: true, file: module_file)
+      { javascript: compiler.compile }
+    end
+
     def print_message(m, level)
       l = m['location']
       STDERR.puts "#{l['file']}:#{l['line']}:#{l['column']}: #{level}: #{m['text']}"
@@ -72,17 +81,6 @@ module Isomorfeus
     end
 
     def handle_errors(asset_key, result)
-      # Todo simplify
-      # unless result['warnings'].empty?
-      #   result['warnings'].each do |w|
-      #     print_message(w, 'warning')
-      #     unless w['notes'].empty?
-      #       w['notes'].each do |n|
-      #         print_message(n, 'note')
-      #       end
-      #     end
-      #   end
-      # end
       unless result['errors'].empty?
         result['errors'].each do |e|
           print_message(w, 'error')
@@ -92,7 +90,7 @@ module Isomorfeus
             end
           end
         end
-        raise "Aseet Manager: error bundling '#{asset_key}'" 
+        raise "Asset Manager: error bundling '#{asset_key}'" 
       end
     end
 
@@ -109,6 +107,25 @@ module Isomorfeus
       JAVASCRIPT
     end
 
+    def init_hmr_listener
+      return unless Dir.exist?(Isomorfeus.app_root)
+      Isomorfeus.hmr_listener = Listen.to(Isomorfeus.app_root) do |modified, added, _|
+        (modified + added).each do |file|
+          begin
+            start = Time.now
+            update = compile_ruby(file)
+            update_json = Oj.dump(update, mode: :strict)
+            Iodine.publish(Isomorfeus.asset_manager_hmr_channel, update_json)
+          rescue Exception => e
+            message = "#{e.message}\n#{e.backtrace.join("\n")}"
+            STDERR.puts message
+            Iodine.publish(Isomorfeus.asset_manager_hmr_channel, Oj.dump({ error: message }, mode: :struct))
+          end
+        end
+      end
+      Isomorfeus.hmr_listener.start
+    end
+
     # possible future improvement
     # loader: {
     #   '.png': 'dataurl',
@@ -137,14 +154,14 @@ module Isomorfeus
         target: 'es6',
         write: true
       });
-      global.res = res;
+      global.res_meta = res.metafile;
       return res;
       JAVASCRIPT
       if analyze
         analysis = @context.await <<~JAVASCRIPT
-        esbuild.analyzeMetafile(global.res.metafile, { verbose: true });
+        esbuild.analyzeMetafile(global.res_meta, { verbose: true });
         JAVASCRIPT
-        STDOUT.puts "Bundle nalysis for #{asset_key}:\n#{analysis}\n"
+        STDOUT.puts "Bundle analysis for #{asset_key}:\n#{analysis}\n"
       end
       handle_errors(asset_key, result)
     end

data/lib/isomorfeus-asset-manager.rb

@@ -3,9 +3,12 @@ require 'thread'
 require 'tmpdir'
 require 'zlib'
 require 'opal'
+require 'opal/compiler'
 require 'opal/builder'
 require 'oj'
 require 'rack'
+require 'listen'
+require 'iodine'
 require 'isomorfeus-speednode'
 require 'isomorfeus/asset_manager/version'
 require 'isomorfeus/asset_manager/js_import'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-asset-manager
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: iodine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.44
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.44
 - !ruby/object:Gem::Dependency
   name: isomorfeus-speednode
   requirement: !ruby/object:Gem::Requirement
@@ -24,20 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.3
+        version: 3.13.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.3
+        version: 3.13.6
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement