s41c 0.0.1 → 0.0.2

data/LICENSE.BSD

@@ -0,0 +1,24 @@
+Copyright (c) 2012 DansingBytes.ru
+All rights reserved.
+
+Author: redfield (up.redfield@gmail.com)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL DansingBytes BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -0,0 +1,75 @@
+S41C (Socket for 1C)
+======
+
+
+TCP-socket-сервер и клиент для платформы "1С:Предприятие"
+
+### Системные требования
+
+* Microsoft Windows семейства NT (32bit)
+* 1С:Предприятие v7
+* [Ruby](http://rubyinstaller.org/downloads/) 1.9.3
+
+### Установка
+
+    gem install s41c
+
+### Пример использования
+
+Запустить сервер для 1C:Предприятия 7.7 (сетевая версия) на localhost:1421
+
+    require 's41c'
+
+    server = S41C::Server.new
+    server.start
+
+Или чуть сложнее: запустить сервер для 1С:Предприятия (локальная версия) на
+127.0.0.1:2000, писать лог в c:\server.log  и записать время остановки 
+сервера в файл
+
+    require 's41c'
+
+    server = S41C::Server.new('127.0.0.1', 2000, 'c:\server.log')
+    server.ole_object = 'V77L.Application'
+
+    server.at_exit do
+      File.open('c:\server_stoped_at.txt', 'w') { |f| f.puts Time.now }
+    end
+
+    server.start
+
+После запуска с сервером можно общаться по telnet. Комманды, содержащие  не-ASCII
+символы, должны быть utf8-строками переведенными в бинарный формат. В руби это 
+можно сделать с помощью метода [String#force_encoding](http://ruby-doc.org/core-1.9.3/String.html#method-i-force_encoding):
+
+    "utf8-строка".force_encoding("BINARY")
+    => "utf8-\xD1\x81\xD1\x82\xD1\x80\xD0\xBE\xD0\xBA\xD0\xB0"
+
+Отвечает сервер в том же формате, т.е. на стороне клиента ответ нужно
+преобразовать в utf-строку:
+
+    "utf8-\xD1\x81\xD1\x82\xD1\x80\xD0\xBE\xD0\xBA\xD0\xB0".force_encoding("UTF-8")
+    => "utf8-строка"
+
+Список команд:
+
+* 'connect|параметры_подключения' - подключиться к базе, например:
+    
+    'connect|/d c:\1c\\'
+
+* 'eval_expr|команда' - выполнить команду
+    
+    'eval_expr|ОсновнойЯзык()'
+
+* 'create|Название.Объекта' - создать объект
+
+    'create|Справочник.Товары'
+
+* 'invoke|НазваниеМетода|параметры|метода' - выполнить процедуру/функцию для объекта
+
+    'invoke|НайтиПоНаименованию|Шляпа с полями'
+
+* 'disconnect' - отключиться от 1С
+* 'shutdown' - остановить сервер
+
+

data/lib/s41c.rb

@@ -1,3 +1,4 @@
+require 'socket'
 require 's41c/version'
 require 's41c/utils'
 require 's41c/server'

data/lib/s41c/client.rb

@@ -0,0 +1,97 @@
+# encoding: utf-8
+
+module S41C
+
+  class Client
+
+    def initialize(host='localhost', port=1421)
+      require 'net/telnet'
+
+      @host, @port = host, port
+      @prompt = /^\+OK/n
+      @errors = []
+
+    end # initialize
+
+    def login(username, password = nil)
+      @login = username.nil? || username.empty? ? nil : username
+      @password = password
+    end # login
+
+    def errors
+      @errors
+    end # errors
+
+    def connect(options)
+      cmd "connect|#{options}"
+    end # connect
+
+    def ping
+      cmd "ping"
+    end # ping
+
+    def eval_expr(expr)
+      cmd "eval_expr|#{expr}"
+    end # eval_expr
+
+    def create(obj_name)
+      cmd "create|#{obj_name}"
+    end # create
+
+    def invoke(method_name, *args)
+      cmd "invoke|#{method_name}|#{args.join('|')}"
+    end # invoke
+
+    def disconnect
+      cmd "disconnect"
+    end # disconnect
+
+    def shutdown
+      cmd "shutdown"
+    end # shutdown
+
+    private
+
+    def conn
+      return true if @client
+      begin
+
+        @client = Net::Telnet.new('Host' => @host, 'Port' => @port, "Prompt" => @prompt)
+
+        if @login
+          resp = @client.login(@login, @password)
+
+          unless resp["success"]
+            @errors << "Invalid login or password"
+            return false
+          end # unless
+        end # if
+
+        return true
+
+      rescue Errno::ECONNREFUSED => e
+        @errors << e.message
+        return false
+      end
+    end # conn
+
+    def cmd(str)
+      return @errors unless conn
+      parse @client.cmd(S41C::Utils.to_bin(str))
+    end # cmd
+
+    def parse(response)
+      resp = S41C::Utils.to_utf8(response)
+      res = []
+
+      resp.each_line do |line|
+        res << line.chomp unless line[@prompt]
+      end # each_line
+
+      res.count > 1 ? res : res.first
+    end # parse
+
+  end # Client
+
+end # S41C
+

data/lib/s41c/server.rb

@@ -2,17 +2,21 @@
 
 module S41C
 
-  require 'win32ole'
-  require 'socket'
-
   class Server
 
     def initialize(host='localhost', port=1421, log_file=nil)
+      require 'win32ole'
+
       @host, @port = host, port
       @logger = log_file ? ::STDOUT.reopen(log_file, 'a') : ::STDOUT
       @ole_object = 'V77.Application'
     end # initialize
 
+    def set_login(username, password)
+      @login = username
+      @password = password
+    end # login_info
+
     def ole_object=(name)
       @ole_object = name
     end # ole_object
@@ -37,60 +41,29 @@ module S41C
       log "*** Server has been started on #{@host}:#{@port}"
       log "*** Ctrl+C for stopping"
 
-      loop do
-
-        begin
-          session = server.accept_nonblock
-        rescue IO::WaitReadable, Errno::EINTR
-          IO.select([server])
-          retry
-        end
-
-        session.print "Welcome\r\n"
-
-        loop {
-          attrs = S41C::Utils.to_utf8(session.gets || '').chomp.split('|')
-          cmd = attrs.shift
-          case cmd
-          when "connect"
-            session.puts S41C::Utils.to_bin(connect_to_1c(attrs))
-            session.puts "+OK"
-          when "create"
-            session.puts S41C::Utils.to_bin(create(attrs))
-            session.puts "+OK"
-          when "eval_expr"
-            session.puts S41C::Utils.to_bin(eval_expr(attrs))
-            session.puts "+OK"
-          when "invoke"
-            session.puts S41C::Utils.to_bin(invoke(attrs))
-            session.puts "+OK"
-          when "disconnect"
-            session.puts "Goodbye"
-            session.close
-          break
-          when "shutdown"
-            session.puts "Server is going down now"
-            session.close
-	    exit
-          else
-            session.puts "Bad command"
-            session.puts "+OK"
-          end
-        }
-
+      begin
+        main_loop(server)
+      rescue Errno::ECONNABORTED
+        log "*** [#{Time.now}] Session aborted"
+        retry
       end
+
     end # start
 
     private
 
+    def read_response(session)
+      S41C::Utils.to_utf8(session.gets || '').chomp
+    end # read_response
+
     def log(msg)
       @logger.puts msg
       @logger.flush
     end # log
 
-    def connect_to_1c(attrs)
+    def connect_to_1c(args)
       @conn.ole_free unless @conn.nil?
-      options = attrs.shift || ''
+      options = args.shift || ''
       begin
         @conn = ::WIN32OLE.new('V77.Application') 
         res = @conn.Initialize(
@@ -105,9 +78,9 @@ module S41C
       end
     end
 
-    def create(attrs)
+    def create(args)
       return "Error: not connected" unless @conn
-      obj_name = attrs.shift || ''
+      obj_name = args.shift || ''
       begin
         @obj = @conn.CreateObject(obj_name)
         "Created"
@@ -116,9 +89,9 @@ module S41C
       end
     end
 
-    def eval_expr(attrs)
+    def eval_expr(args)
       return "Error: not connected" unless @conn
-      expr = attrs.shift || ''
+      expr = args.shift || ''
       begin
         @conn.invoke("EvalExpr", expr).to_s
       rescue => e
@@ -126,15 +99,80 @@ module S41C
       end
     end
 
-    def invoke(attrs)
+    def invoke(args)
       return "Error: working object not found. You must create it before" unless @conn
       begin
-        @obj.invoke(*attrs).to_s.encode("UTF-8", "IBM866", :invalid => :replace, :replace => "?")
+        @obj.invoke(*args).to_s.encode("UTF-8", "IBM866", :invalid => :replace, :replace => "?")
       rescue => e
         "Error: #{e.message}"
       end
     end
 
+    def main_loop(server)
+      loop do
+
+        begin
+          session = server.accept_nonblock
+        rescue IO::WaitReadable, Errno::EINTR
+          IO.select([server])
+          retry
+        end
+
+        if @login
+          res = true
+          session.print "login"
+          res = res && (read_response(session) == @login)
+          if @password
+            session.print "password"
+            res = res && (read_response(session) == @password)
+          end
+
+          if res
+            session.puts("success")
+            session.puts("+OK")
+          else
+            session.puts "\n\rInvalid login or password"
+            session.close
+            next
+          end # if
+        end
+
+        loop {
+          args = S41C::Utils.to_utf8(session.gets || '').chomp.split('|')
+          cmd = args.shift
+          case cmd
+          when "connect"
+            session.puts S41C::Utils.to_bin(connect_to_1c(args))
+            session.puts "+OK"
+          when "create"
+            session.puts S41C::Utils.to_bin(create(args))
+            session.puts "+OK"
+          when "eval_expr"
+            session.puts S41C::Utils.to_bin(eval_expr(args))
+            session.puts "+OK"
+          when "invoke"
+            session.puts S41C::Utils.to_bin(invoke(args))
+            session.puts "+OK"
+          when "ping"
+            session.puts "pong"
+            session.puts "+OK"
+          when "disconnect"
+            session.puts "Goodbye"
+            session.close
+            break
+          when "shutdown"
+            session.puts "Server is going down now"
+            session.close
+            exit
+          else
+            session.puts "Bad command"
+            session.puts "+OK"
+          end
+        }
+
+      end
+    end # main_loop
+
   end # Server
 
 end # S41C

data/lib/s41c/version.rb

@@ -1,5 +1,5 @@
 module S41C
 
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
 end # S41C

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s41c
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies: []
 description: TCP-socket сервер и клиент для платформы "1С:Предприятие"
 email:
@@ -18,8 +18,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.BSD
 - s41c.gemspec
 - s41c-0.0.1.gem
+- README.md
 - lib/s41c/version.rb
 - lib/s41c/utils.rb
 - lib/s41c/server.rb