sass-embedded 1.2.2 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ece7b47b80c138eaa6fc421f0d583576f88ff8c1400da32257286ee91b15caf9
-  data.tar.gz: 677da00dc0a4257d5dfe2b5c8b61e3d208001b6dc1da0e517330f6277d507d88
+  metadata.gz: 7dffd620ac06d052e6e95e09031ad514c89fba2412d782dd1f546db088936056
+  data.tar.gz: b370d90e94189504b07f35256ea2dc5891f879236d11e99fc443cf6becbd8e4a
 SHA512:
-  metadata.gz: 4cd965978023da3f88dec165ad20d478b097819c403b28d2640731b42c5afaf6ad8272f19ae84a6b1a491e88b7ced579568ccb2e53d87acb675d761f1605e90f
-  data.tar.gz: 8fb45773f5549e264416397055ac7ebd13cdaf7826920eea2b9e15e3a81268d742ab17883b3c37bc7304d50db72cfe57acd79980f920fc0769d53443e681d364
+  metadata.gz: d5ec4d5b99e9cdcfcbfef8bce95625f81860dafbad7cdd86f8077a14786a28b6ec969caccb5de2a2cc88e592757af2b74f61d68d212575382b7060ac33a90626
+  data.tar.gz: 4f43882a8d3eea5788297a604cca8742d13a66061cebd5ab791e68922f5acb25c26e138b33a5fc6de552f8dc6e7b0563f617c1321399e493b07a274abb527efe

data/lib/sass/embedded/compiler.rb

@@ -18,7 +18,7 @@ module Sass
         Thread.new do
           loop do
             warn(@stderr.readline, uplevel: 1)
-          rescue IOError, SystemCallError
+          rescue IOError, Errno::EBADF
             break
           end
         end

data/lib/sass/embedded/dispatcher.rb

@@ -6,20 +6,24 @@ module Sass
     #
     # It dispatches messages between mutliple instances of {Host} and a single {Compiler}.
     class Dispatcher
-      PROTOCOL_ERROR_ID = 4_294_967_295
+      PROTOCOL_ERROR_ID = 0xffffffff
 
       def initialize
         @compiler = Compiler.new
         @observers = {}
-        @id = 0
+        # TODO: Revert to `@id = 0` when upstream bug is fixed
+        # https://github.com/sass/dart-sass-embedded/pull/80
+        @id = 0xfffffffe
         @mutex = Mutex.new
 
         Thread.new do
           loop do
             receive_message EmbeddedProtocol::OutboundMessage.decode @compiler.read
-          rescue IOError, SystemCallError => e
-            half_close
-            @observers.each_value do |observer|
+          rescue IOError, Errno::EBADF => e
+            @mutex.synchronize do
+              @id = PROTOCOL_ERROR_ID
+              @observers.values
+            end.each do |observer|
               observer.error e
             end
             break
@@ -29,7 +33,7 @@ module Sass
 
       def subscribe(observer)
         @mutex.synchronize do
-          raise EOFError if half_closed?
+          raise EOFError if @id == PROTOCOL_ERROR_ID
 
           id = @id
           @id = id.next
@@ -39,9 +43,11 @@ module Sass
       end
 
       def unsubscribe(id)
-        @observers.delete(id)
+        @mutex.synchronize do
+          @observers.delete(id)
 
-        close if half_closed? && @observers.empty?
+          close if @id == PROTOCOL_ERROR_ID && @observers.empty?
+        end
       end
 
       def close
@@ -58,27 +64,21 @@ module Sass
 
       private
 
-      def half_close
-        @mutex.synchronize do
-          @id = PROTOCOL_ERROR_ID
-        end
-      end
-
-      def half_closed?
-        @id == PROTOCOL_ERROR_ID
-      end
-
       def receive_message(outbound_message)
         oneof = outbound_message.message
         message = outbound_message.public_send(oneof)
         case oneof
         when :error
-          half_close
-          @observers[message.id]&.public_send(oneof, message)
+          @mutex.synchronize do
+            @id = PROTOCOL_ERROR_ID
+            message.id == PROTOCOL_ERROR_ID ? @observers.values : [@observers[message.id]]
+          end.each do |observer|
+            observer.public_send(oneof, message)
+          end
         when :compile_response, :version_response
-          @observers[message.id].public_send(oneof, message)
+          @mutex.synchronize { @observers[message.id] }.public_send(oneof, message)
         when :log_event, :canonicalize_request, :import_request, :file_import_request, :function_call_request
-          Thread.new(@observers[message.compilation_id]) do |observer|
+          Thread.new(@mutex.synchronize { @observers[message.compilation_id] }) do |observer|
             observer.public_send(oneof, message)
           end
         else

data/lib/sass/embedded/host.rb

@@ -13,7 +13,6 @@ module Sass
     class Host
       def initialize(channel)
         @channel = channel
-        @mutex = Mutex.new
       end
 
       def id
@@ -126,16 +125,14 @@ module Sass
       private
 
       def await
-        @mutex.synchronize do
-          raise EOFError if defined? @async
-
-          @connection = @channel.connect(self)
-          @async = Async.new
-          yield
-          @async.await
-        ensure
-          @connection.disconnect
-        end
+        raise EOFError if defined? @async
+
+        @connection = @channel.connect(self)
+        @async = Async.new
+        yield
+        @async.await
+      ensure
+        @connection.disconnect
       end
     end
 

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.2.2'
+    VERSION = '1.2.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.5
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -159,8 +159,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.2.2
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.2.2
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.2.5
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.2.5
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []