kscript 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c190f7d80e71baae5ec95db4f903cdc3ef98ea7403d5025eb9fcda0c4be18cc
-  data.tar.gz: f3150fac2025ac947c4e24b0dda29dee0e08f8cf4b2528322a64cfd6296f8e4b
+  metadata.gz: 812d19779e0fadd4fc72f94999c3d8776a2391147c467c14067d203050c94c01
+  data.tar.gz: adad5fb5f74798030650f6595f8e90fc86eacfb490a4b7bb5c2fefca1d4552d7
 SHA512:
-  metadata.gz: 2b522f1d8c390648132e3419e7ad186aa6acb4fdec572f37428f0697a076bde0f330bf0f035c08b833f60e5fbd31424b36bd2c3830973f72051b9aad9553e2b0
-  data.tar.gz: c3428e2286edec3f3a5a75208c37803660fb7a0f47047e5c6e122d7f4c547dfc64a046cada3ad8a1aafbfaeccb6374bdcd3bfbf2e749bf7ffe453396f59be645
+  metadata.gz: e2fff6ee0202f526fb11452d3848ce5d2c0f872bb6c457ebbf8dec4f55e45c0532fbd1b8daddc0d58133814c83553ef6a9f8e063c1ef4812bdf9bd4c869ec364
+  data.tar.gz: 6866406cb4c5fd9c74b079c636d778171099db330309f38e13dcfd85f2adbdcd3aa2d96a453b8ad46f46fc505353d4c175b0c40a41732743da7073ce386f2c43

data/Rakefile

@@ -33,3 +33,10 @@ task :dev do
     kscript version
   SHELL
 end
+
+task :install do
+  sh <<-SHELL
+    gem uninstall kscript -aIx
+    gem install kscript
+  SHELL
+end

data/kscript.gemspec

@@ -27,7 +27,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Runtime dependencies
+  spec.add_dependency 'bcrypt', '>= 3.1', '< 4.0'
   spec.add_dependency 'http', '>= 4.0', '< 6.0'
+  spec.add_dependency 'nokogiri', '>= 1.13', '< 2.0'
   spec.add_dependency 'thor', '1.3.2'
 
   # Development dependencies
@@ -35,11 +37,4 @@ Gem::Specification.new do |spec|
   spec.metadata['rubygems_mfa_required'] = 'true'
 
   # spec.extensions = ['ext/install.rb'] # 已移除，防止 native extension build 错误
-
-  spec.post_install_message = <<~MSG
-    [kscript] Shell completion is available!
-    To enable shell completion for your shell, please run:
-      ruby ext/install.rb
-    Or see README for more details.
-  MSG
 end

data/lib/kscript/base.rb

@@ -7,11 +7,9 @@ module Kscript
   class Base
     attr_reader :logger
 
-    def initialize(service: nil, log_level: nil, trace_id: nil)
+    def initialize(service: nil, log_level: nil)
       config = defined?(Kscript::Utils::Config) ? Kscript::Utils::Config.load : nil
       log_level ||= config&.log_level || ENV['KSCRIPT_LOG_LEVEL'] || :info
-      trace_id ||= config&.trace_id || ENV['KSCRIPT_TRACE_ID']
-      @trace_id = trace_id
       @logger = Kscript::Logger.new(service: service || self.class.name, level: log_level)
       @logger.set_human_output(human_output?)
     end
@@ -24,12 +22,6 @@ module Kscript
       exit(1)
     end
 
-    # 提供 trace_id 给 logger
-    def logger
-      @logger.define_singleton_method(:default_trace_id) { @trace_id } if @trace_id
-      @logger
-    end
-
     # 自动注册所有 Kscript::Base 的子类为插件
     def self.inherited(subclass)
       name = subclass.name.split('::').last

data/lib/kscript/cli.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require 'kscript'
-require 'io/console'
 require 'kscript/banner'
-require 'thor'
 
 module Kscript
   class CLI < Thor

data/lib/kscript/logger.rb

@@ -45,19 +45,17 @@ module Kscript
     end
 
     def log(level, message, context = {})
-      trace_id = context[:trace_id] || (respond_to?(:default_trace_id) ? default_trace_id : nil) || SecureRandom.hex(8)
       entry = {
         timestamp: Time.now.utc.iso8601,
         level: level.to_s.upcase,
         service: @service,
         message: message,
-        trace_id: trace_id,
-        context: context.reject { |k, _| k == :trace_id }
+        context: context
       }
       @logger.send(level, entry.to_json)
     end
 
-    # 极客风格终端输出
+    # 终端输出
     def klog(level, message, context = {})
       if human_output?
         puts "[#{level.to_s.upcase}] #{message} #{context.map { |k, v| "#{k}=#{v}" }.join(' ')}".strip
@@ -67,7 +65,7 @@ module Kscript
         svc = @service || 'kscript'
         trace = context[:trace_id] || (respond_to?(:default_trace_id) ? default_trace_id : nil) || '-'
         color = COLORS[level] || COLORS[:info]
-        ctx_str = context.reject { |k, _| k == :trace_id }.map { |k, v| "#{k}=#{v}" }.join(' ')
+        ctx_str = context.map { |k, v| "#{k}=#{v}" }.join(' ')
         line = "[#{ts}] [#{lvl}] [#{svc}] [#{trace}] #{message}"
         line += " | #{ctx_str}" unless ctx_str.empty?
         $stdout.puts "#{color}#{line}#{COLORS[:reset]}"

data/lib/kscript/plugins/kk_ip_utils.rb

@@ -7,9 +7,6 @@
 
 require 'kscript'
 
-require 'http'
-require 'json'
-
 module Kscript
   class KkIpUtils < Base
     IP_API_BASE_URL = 'http://ip-api.com/json'

data/lib/kscript/plugins/kk_jenkins_utils.rb

@@ -6,12 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'http'
-require 'base64'
-require 'rexml/document'
-require 'json'
-require 'fileutils'
-require 'kscript/base'
 
 module Kscript
   class KkJenkinsUtils < Base

data/lib/kscript/plugins/kk_kibana_utils.rb

@@ -6,7 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'securerandom'
 
 module Kscript
   class KkKibanaUtils < Base

data/lib/kscript/plugins/kk_optimize_utils.rb

@@ -6,7 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'open3'
 
 module Kscript
   class KkOptimizeUtils < Base

data/lib/kscript/plugins/kk_portscan_utils.rb

@@ -6,8 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'socket'
-require 'timeout'
 
 module Kscript
   class KkPortscanUtils < Base
@@ -17,10 +15,11 @@ module Kscript
     # @param host [String] target host to scan
     # @param ports [Array<Integer>] list of ports to scan
     # @param thread_count [Integer] number of concurrent threads
-    def initialize(target = nil, ports = (1..1024), *_args, **opts)
+    def initialize(target = nil, ports = (1..1024), thread_count = 50, *_args, **opts)
       super(**opts.merge(service: 'kk_port_scanner'))
       @target = target
-      @ports = ports.is_a?(Range) ? ports : (1..1024)
+      @ports = parse_ports(ports)
+      @thread_count = (opts[:thread_count] || thread_count || 50).to_i
     end
 
     def run
@@ -31,23 +30,62 @@ module Kscript
 
     # Execute port scanning using multiple threads
     def scan
-      msg = "Scanning #{@target} ports #{@ports}"
+      msg = "Scanning #{@target} ports #{@ports} with concurrency=#{@thread_count}"
       if human_output?
         puts msg
       else
         logger.kinfo(msg)
       end
-      @ports.each do |port|
-        Socket.tcp(@target, port, connect_timeout: 0.5) do |_sock|
-          if human_output?
-            puts "Port #{port} is open"
-          else
-            logger.kinfo('Port open', port: port)
-            logger.kinfo("Port #{port} is open")
+      queue = Queue.new
+      @ports.each { |port| queue << port }
+      threads = []
+      @thread_count.times do
+        threads << Thread.new do
+          until queue.empty?
+            port = nil
+            begin
+              port = queue.pop(true)
+            rescue ThreadError
+              break
+            end
+            begin
+              Socket.tcp(@target, port, connect_timeout: 0.5) do |_sock|
+                if human_output?
+                  puts "Port #{port} is open"
+                else
+                  logger.kinfo('Port open', port: port)
+                  logger.kinfo("Port #{port} is open")
+                end
+              end
+            rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, SocketError
+              # closed or filtered
+            end
           end
         end
-      rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, SocketError
-        # closed or filtered
+      end
+      threads.each(&:join)
+    end
+
+    # 支持多种端口参数格式: 22,80,443 或 1..1024
+    def parse_ports(ports)
+      return ports.to_a if ports.is_a?(Range)
+
+      if ports.is_a?(String)
+        if ports.include?(',')
+          ports.split(',').map(&:to_i)
+        elsif ports.include?('..')
+          begin
+            eval(ports).to_a
+          rescue StandardError
+            (1..1024).to_a
+          end
+        else
+          [ports.to_i]
+        end
+      elsif ports.is_a?(Array)
+        ports.map(&:to_i)
+      else
+        (1..1024).to_a
       end
     end
 
@@ -56,11 +94,11 @@ module Kscript
     end
 
     def self.arguments
-      '<target_host>'
+      '<target_host> [ports] [thread_count]'
     end
 
     def self.usage
-      "kscript portscan 192.168.1.1\nkscript portscan example.com --ports=22,80,443"
+      "kscript portscan 192.168.1.1\nkscript portscan example.com 22,80,443 100\nkscript portscan 192.168.1.1 1..1024 200"
     end
 
     def self.group

data/lib/kscript/plugins/kk_projscan_utils.rb

@@ -6,7 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'json'
 
 module Kscript
   class KkProjscanUtils < Base

data/lib/kscript/plugins/kk_sh_utils.rb

@@ -6,7 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'nokogiri'
 
 module Kscript
   class KkShUtils < Base

data/lib/kscript/plugins/kk_wg_pass_utils.rb

@@ -6,7 +6,6 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
-require 'bcrypt'
 
 module Kscript
   class KkWgPassUtils < Base

data/lib/kscript/utils.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'yaml'
-require 'fileutils'
-
 module Kscript
   module Utils
     class Config
@@ -24,10 +21,6 @@ module Kscript
         self['log_level']
       end
 
-      def trace_id
-        self['trace_id']
-      end
-
       # 自动检测并安装 shell 补全脚本
       def self.ensure_completion_installed(shell = nil)
         shell ||= ENV['SHELL']

data/lib/kscript/version.rb

@@ -6,5 +6,5 @@
 # https://opensource.org/licenses/MIT
 
 module Kscript
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

data/lib/kscript.rb

@@ -5,9 +5,26 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
+# Ruby 标准库
 require 'json'
 require 'logger'
 require 'securerandom'
+require 'yaml'
+require 'fileutils'
+require 'base64'
+require 'rexml/document'
+require 'net/http'
+require 'timeout'
+require 'socket'
+require 'open3'
+require 'openssl'
+
+# 第三方 gem
+require 'http'
+require 'bcrypt'
+require 'nokogiri'
+require 'thor'
+
 require 'kscript/plugins'
 require 'kscript/base'
 require 'kscript/logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kscript
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Kk
@@ -10,6 +10,26 @@ bindir: bin
 cert_chain: []
 date: 2025-07-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -30,6 +50,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -104,11 +144,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: |
-  [kscript] Shell completion is available!
-  To enable shell completion for your shell, please run:
-    ruby ext/install.rb
-  Or see README for more details.
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib