execjs-xtrn 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c96df8410557171dfaf3c5943b31f5b098b2f8a8
-  data.tar.gz: 24ca85d50e1bdf4c7945385849bef1532091ae3e
+  metadata.gz: 92eb4b9da9c63cce96b83919a69cfce05124ee02
+  data.tar.gz: d9e42c5f04097be48ca41c32a8bcb8a00eb1b1da
 SHA512:
-  metadata.gz: ffb757e3b1d4f256916646dfa1139186da502e43ac277fc0b03342bd65dc2ad16c5ccc3367dec0b52d46fe78626e4cf6113eac5049ba7cd375093febdf62da56
-  data.tar.gz: 12426082a20e85dd543483f50d2535696bbb2ea072217f7b42d12aae45640bd9d647d72886478cca17d22985d54f60c9c9985b14e74b8911ea1f8500c9a629bb
+  metadata.gz: f133ee547118f3238f9bba5d3bf6cb2b6756ee5c21e542ebc1bf703ea4cf619f8f18d72069b02113dcbade9c04c312f54e41ab6937c172a7efbed13db668c03e
+  data.tar.gz: 85cf9c01a68717bdb29bbf68f8582f8406d8c0632da369b70fdebc7733ec3097fe8975f8493bfbaf0071ec9da3b586458f0ef3903e9726b5e7b297c8bc97f878

data/lib/execjs/node/index.js

@@ -30,11 +30,15 @@ function wrap(s)
 function compile(s)
 {
   s = JSON.parse(s)
-  if('object'==typeof s)
-    return vmCmd(s)
-  if('string'!=typeof s)
-    throw Error('String expected!')
-  return ok(new Function(s)())
+  switch(typeof s)
+  {
+    case 'string':
+      return ok(new Function(s)())
+    case 'object':
+      return vmCmd(s)
+    default:
+      throw Error('String expected!')
+  }
 }
 
 function ok(v)

data/lib/execjs/node/node_modules/split/index.js

@@ -16,6 +16,7 @@ function split (matcher, mapper, options) {
   var decoder = new Decoder()
   var soFar = ''
   var maxLength = options && options.maxLength;
+  var trailing = options && options.trailing === false ? false : true
   if('function' === typeof matcher)
     mapper = matcher, matcher = null
   if (!matcher)
@@ -55,9 +56,8 @@ function split (matcher, mapper, options) {
   function () {
     if(decoder.end)
       next(this, decoder.end())
-    if(soFar != null)
+    if(trailing && soFar != null)
       emit(this, soFar)
     this.queue(null)
   })
 }
-

data/lib/execjs/node/package.json

@@ -1,7 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "split": "^0.3.0",
-    "through": "^2.3.6"
+    "split": "^1.0.0"
   }
 }

data/lib/execjs/wsh/es5.js

@@ -4,10 +4,42 @@
 +function (){
 
 if(!Object.create)
-  Object.create = function(proto){
-    function fn(){}
-    fn.prototype=proto
-    return new fn
-  }
+Object.create = function(proto) {
+  function fn() {}
+  fn.prototype = proto
+  return new fn
+}
+
+if(!Object.keys)
+Object.keys = function(obj) {
+  var results = []
+  for (var k in obj)
+    results.push(k)
+  return results
+}
+
+var base = Array.prototype
+if(!base.indexOf)
+base.indexOf = function(el) {
+  for (var i = this.length - 1; i >= 0; i--)
+    if (el === this[i])
+      return i
+  return -1
+}
+
+if(!base.forEach)
+base.forEach = function(fn) {
+  for (var i = 0, len = this.length; i < len; i++)
+    fn(this[i], i, this)
+}
+
+if(!base.filter)
+base.filter = function(fn) {
+  var z, results = []
+  for (var i = 0, len = this.length; i < len; i++)
+    if (fn(z = this[i], i, this))
+      results.push(z)
+  return results
+}
 
 }()

data/lib/execjs/wsh/repl.js

@@ -1,12 +1,16 @@
 //
 // Communicate with cscript via stdin/stderr
 //
+// For using vm-commands must be run from 32-bit cscript (true if Ruby is 32-bit)
+//
 +function(){
 
 var
   w = WScript,
   i = w.StdIn,
-  o = w.StdErr
+  o = w.StdErr,
+  vms = {},
+  lastShim
 
 loadShivs('json2 es5')
 
@@ -25,9 +29,15 @@ function wrap(s)
 function compile(s)
 {
   s = JSON.parse(s)
-  if('string'!=typeof s)
-    throw Error('String expected!')
-  return ok(new Function(s)())
+  switch(typeof s)
+  {
+    case 'string':
+      return ok(new Function(s)())
+    case 'object':
+      return vmCmd(s)
+    default:
+      throw Error('String expected!')
+  }
 }
 
 function ok(v)
@@ -35,28 +45,55 @@ function ok(v)
   return 'undefined'==typeof v ? {} : {ok: v}
 }
 
-// Load JSON2
-function json2()
-{
-  var
-    fso = new ActiveXObject("Scripting.FileSystemObject"),
-    j2 = fso.GetParentFolderName(w.ScriptFullName)+"/json2.js"
-  new Function(fso.OpenTextFile(j2).ReadAll())()
-}
-
-function loadJS(name)
+function jsText(name)
 {
   var
     fso = new ActiveXObject("Scripting.FileSystemObject")
   name = fso.GetParentFolderName(w.ScriptFullName)+"/"+name+".js"
-  new Function(fso.OpenTextFile(name).ReadAll())()
+  return fso.OpenTextFile(name).ReadAll()
 }
 
 function loadShivs(names)
 {
   names = names.split(' ')
   for(var i in names)
-    loadJS(names[i])
+    new Function(lastShim = jsText(names[i]))()
+}
+
+function vmCmd(s)
+{
+  if(!('vm' in s))
+    throw Error('VM command expected!')
+  if('js' in s)
+    return vmEval(s)
+  if(!s.vm)
+    return {vm: vmNew()}
+  delete vms[s.vm]
+  return {}
+}
+
+function vmNew()
+{
+  var i, r
+  for(i = 10; i>0; i--)
+    if((r = /\d{3,}/.exec(Math.random())) && !vms[r = r[0]])
+    {
+      vms[r] = i = new ActiveXObject('ScriptControl')
+      i.Language = 'JScript'
+      i.addCode(lastShim)
+      return r
+    }
+  throw Error('Cannot generate random number')
+}
+
+function vmEval(s)
+{
+  var z = vms[s.vm]
+  if(!z)
+    throw Error('VM not found')
+  if('string'!=typeof s.js)
+    throw Error('String expected!')
+  return ok(z.eval('new Function('+JSON.stringify(s.js)+')()'))
 }
 
 }()

data/lib/execjs/xtrn.rb

@@ -2,7 +2,7 @@ require_relative "xtrn/rails"
 
 module ExecJS::Xtrn
 
-  Engines=[Nvm, Node, Wsh]
+  Engines=[Nvm, Node, Wsh, Wvm, Ole]
 
   class << self
     attr_accessor :engine

data/lib/execjs/xtrn/engine.rb

@@ -9,11 +9,9 @@ class ExecJS::Xtrn::Engine
 
   Run=nil # Abstract class
 
-  @stats=@@stats={c: 0}
-
   def exec(code)
     return if (code=code.to_s.strip).length==0
-    result=child.say code
+    result=say code
     result={'err'=>'Invalid JS result'} unless Hash===result
     raise Error, result['err'] if result['err']
     result['ok']
@@ -61,14 +59,30 @@ class ExecJS::Xtrn::Engine
 
   private
 
+  def self.class_stats increment = 1
+    s = @stats ||= {c: 0}
+    s[:c] += increment
+    s
+  end
+
+  def self.bear
+    raise NotImplementedError, self unless self::Run
+    ExecJS::Xtrn::Child.new self::Run
+  end
+
+  def self.child
+    bear.tap {|c| c.stats self.class_stats, ExecJS::Xtrn::Engine.class_stats}
+  end
+
   def child
     return @child if @child
-    raise NotImplementedError, self.class unless self.class::Run
-    @child=child=ExecJS::Xtrn::Child.new(self.class::Run)
-    child.stats @stats={}, @@stats, classStats=self.class.class_eval{@stats||={c: 0}}
-    @@stats[:c]+=1
-    classStats[:c]+=1
-    child
+    c = self.class.child
+    c.stats @stats = {}
+    @child = c
+  end
+
+  def say code
+    child.say code
   end
 
   def initialize

data/lib/execjs/xtrn/node.rb

@@ -1,4 +1,4 @@
-require_relative 'engine'
+require_relative 'vm'
 
 class ExecJS::Xtrn::Node < ExecJS::Xtrn::Engine
 
@@ -7,15 +7,15 @@ class ExecJS::Xtrn::Node < ExecJS::Xtrn::Engine
     path: 'node',
   }
 
-  Names=%w(nodejs node)
+  Names=%w(nodejs node iojs)
 
   def self.valid?
-    i=Names.index do |n|
-      Run[:args][0]=n
-      {"ok"=>42}==ExecJS::Xtrn::Child.new(Run).say('return 7*6') rescue nil
+    Names.each do |n|
+      Run[:args][0] = n
+      return true if {"ok"=>42} === bear.say('return 7*6') rescue nil
     end
-    Run[:args][0]='!' unless i
-    !!i
+    Run[:args][0]='!'
+    false
   end
 
   Valid=valid?

data/lib/execjs/xtrn/nvm.rb

@@ -4,44 +4,5 @@
 require_relative 'node'
 
 class ExecJS::Xtrn::Nvm < ExecJS::Xtrn::Node
-
-  def exec(code)
-    return if (code=code.to_s.strip).length==0
-    result=say vm: vm, js: code
-    result={'err'=>'Invalid JS result'} unless Hash===result
-    raise Error, result['err'] if result['err']
-    result['ok']
-  end
-
-  private
-
-  def child
-    @@child||=super
-  end
-
-  def say(code)
-    ch=@@child
-    @stats[:once]=1
-    ch.stats @stats
-    ch.say code
-  end
-
-  def vm
-    return @vm if @vm
-    c=child
-    @stats[:once]=1 if @stats # Remove @stats, added by Engine
-    @stats={}                 # Our new stats
-    vm=say({vm: 0})['vm']
-    raise Error, 'Cannot create VM' unless vm
-    cs=self.class.class_eval{@stats}
-    cs[:m]||=0
-    cs[:m]+=1
-    ObjectSpace.define_finalizer(self)do
-      cs[:x]||=0
-      cs[:x]+=1
-      c.say vm: vm rescue nil
-    end
-    @vm=vm
-  end
-
+  include ExecJS::Xtrn::VM
 end

data/lib/execjs/xtrn/ole.rb

@@ -0,0 +1,85 @@
+require_relative 'wvm'
+
+class ExecJS::Xtrn::Ole < ExecJS::Xtrn::Wsh
+
+  class Error < ExecJS::Xtrn::Error
+    def initialize error
+      # In addition, say: $stdout.set_encoding Encoding.default_external
+      super error.message.force_encoding Encoding.default_external
+    end
+  end
+
+  def self.valid?
+    return unless Gem.win_platform?
+    require 'win32ole'
+    WIN32OLE.codepage = WIN32OLE::CP_UTF8
+    WIN32OLE.new 'ScriptControl'
+    true
+  rescue
+    false
+  end
+
+  Valid = valid?
+
+  def exec code
+    return if (code=code.to_s.strip).length==0
+    result = nil
+    delta={
+      n: 1, # calls
+      o: 0, # out bytes
+      i: 0, # in bytes
+      t: Time.now # time spent
+    }
+    begin
+      result = parse vm.eval "new Function(#{JSON.dump code})()"
+    rescue WIN32OLERuntimeError=>e
+      raise Error.new e
+    ensure
+      delta[:t]=Time.now-delta[:t]
+      delta[:o]=code.length
+      delta[:i]=JSON.dump(result).length if result
+      @statz.each{|var| delta.each{|k, v| var[k]||=0; var[k]+=v}}
+    end
+  end
+
+  private
+
+  Json2 = File.expand_path('../../wsh/json2.js', __FILE__)
+
+  def vm
+    return @vm if @vm
+    @statz = [
+      @stats||={},
+      self.class.class_stats,
+      ExecJS::Xtrn::Engine.class_stats(0)
+    ]
+    vm = WIN32OLE.new 'ScriptControl'
+    vm.Language = 'JScript'
+    vm.addCode File.read ES5
+    @vm = vm
+  end
+
+  @@json = nil
+
+  def json
+    return @@json if @@json
+    j = WIN32OLE.new 'ScriptControl'
+    j.Language = 'JScript'
+    j.addCode File.read Json2
+    j.addCode <<-EOJ
+      function jsonDump(o)
+      {
+        return JSON.stringify(o)
+      }
+    EOJ
+    @@json = j
+  end
+
+  def parse result
+    WIN32OLE===result ?
+      JSON.parse(json.run 'jsonDump', result)
+    :
+      result
+  end
+
+end

data/lib/execjs/xtrn/rails.rb

@@ -1,2 +1,2 @@
-require_relative 'wsh'
+require_relative 'ole'
 require_relative 'routing' if defined? Rails::Application

data/lib/execjs/xtrn/version.rb

@@ -1,5 +1,5 @@
 module ExecJS
   module Xtrn
-    VERSION = "1.1.4"
+    VERSION = "1.2.0"
   end
 end

data/lib/execjs/xtrn/vm.rb

@@ -0,0 +1,46 @@
+#
+# Using VM with Engine
+#
+
+require_relative 'engine'
+
+module ExecJS::Xtrn::VM
+  private
+
+  Error = ExecJS::Xtrn::Error
+
+  def self.included base
+    def base.child # override class.child
+      @child ||= super  # Single child for engine
+    end
+  end
+
+  def child
+    @child ||= self.class.child
+  end
+
+  def say code
+    @stats ||= {}
+    @stats[:once] = 1
+    c = child
+    c.stats @stats
+    c.say vm: vm, js: code
+  end
+
+  def vm
+    return @vm if @vm
+    c = child
+    vm = c.say({vm: 0})['vm']
+    raise Error, 'Cannot create VM' unless vm
+    cs = self.class.class_stats 0
+    cs[:m] ||= 0
+    cs[:m] += 1
+    ObjectSpace.define_finalizer self do
+      cs[:x] ||= 0
+      cs[:x] += 1
+      c.say vm: vm rescue nil
+    end
+    @vm = vm
+  end
+
+end

data/lib/execjs/xtrn/wsh.rb

@@ -12,5 +12,5 @@ class ExecJS::Xtrn::Wsh < ExecJS::Xtrn::Engine
 
   Valid=Gem.win_platform?
 
-  exec '//' rescue nil if Valid # Warm up
+  bear.say '//' rescue nil if Valid # Warm up
 end

data/lib/execjs/xtrn/wvm.rb

@@ -0,0 +1,19 @@
+#
+# Virtual machine interface to Windows Script Host
+#
+require_relative 'wsh'
+
+class ExecJS::Xtrn::Wvm < ExecJS::Xtrn::Wsh
+  include ExecJS::Xtrn::VM
+
+  # Force 32-bit cscript
+  def self.patch64
+    return unless Gem.win_platform?
+    return unless File.exist? exe =
+      File.join(ENV['windir'], 'syswow64/cscript.exe')
+    args = Run[:args].dup
+    args[0] = exe
+    @run32 = Run.merge args: args
+  end
+  Run = @run32 if self.patch64
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: execjs-xtrn
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Stas Ukolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -127,11 +127,14 @@ files:
 - lib/execjs/xtrn/engine.rb
 - lib/execjs/xtrn/node.rb
 - lib/execjs/xtrn/nvm.rb
+- lib/execjs/xtrn/ole.rb
 - lib/execjs/xtrn/rails.rb
 - lib/execjs/xtrn/routes.rb
 - lib/execjs/xtrn/routing.rb
 - lib/execjs/xtrn/version.rb
+- lib/execjs/xtrn/vm.rb
 - lib/execjs/xtrn/wsh.rb
+- lib/execjs/xtrn/wvm.rb
 homepage: https://github.com/ukoloff/execjs-xtrn
 licenses:
 - MIT
@@ -152,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: 'Proof-of-concept: make ExecJS fast even without therubyracer'