njongto_zon 0.0.53 → 0.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34fb218d5d81c99ab654b171a7c2bb19e8f22d7bac9ce9398ab9f302da789720
-  data.tar.gz: 064af67ad7abb50f6eb3f507e927ee7ff5e0bc84e283a6a207aafb90d90a569e
+  metadata.gz: d29eb57e77b5d665727ee67a1a9dab7e5567587e64e7c74a3064179ee5c3cdfe
+  data.tar.gz: 10acdec9e804c365512bc934e8bce3ff5166370a5b6136374741d017cf33857c
 SHA512:
-  metadata.gz: c6fddaf58cd15751f652b2a5214875073afeb36c981a46718d9be7457828b71fe3fe414cd02bbb00fd08ec978815a36cdfd13ee850c7b94e6c6f9ca7049f0f10
-  data.tar.gz: cb153cea656ec04403c68471839f7957eada646fb988666385079ca5269ea3af1e9e26fd7dc1594ddbe8fc92df9427667b6381da170a444bdb1865b47ba0803b
+  metadata.gz: 72314e925d013a5b9d638feea7dce2a0529abf959b0f26f3996c0f29312eefe0d38e16fd6956d5b390a94f5d8cbca855fc514f8bd00139b0148d784d5d406a2a
+  data.tar.gz: fc09e729a98e6908305843d66bf6ff6ea1f616b242a32c6862294cc7cec46ab07c2afdd38134dcc0c940289488ffc49b295c30966059ddfc30b5717271bbf249

data/lib/njongto_zon.rb

@@ -500,7 +500,7 @@ end
                             puts 'Tethering IP change...'
                           
                             stdout, stderr, status = Open3.capture3('./adb devices')
-                            
+                          
                             if status.success?
                               device_id = stdout.split("\n")[1].split("\t")[0]
                               puts device_id
@@ -508,42 +508,53 @@ end
                               # ADB 서버 초기화
                               puts 'adb kill-server'
                               Open3.capture3('./adb kill-server')
-                              sleep(3)
+                              sleep(5)  # ADB 서버가 안정될 시간을 충분히 주기
                           
                               # 다시 ADB 서버 실행
                               puts 'adb start-server'
                               Open3.capture3('./adb start-server')
-                              sleep(3)
+                              sleep(5)  # ADB 서버가 안정될 시간을 충분히 주기
                           
                               # 데이터를 끄고 켜기
                               puts 'adb -s ' + device_id + ' shell svc data disable'
-                              stdout2, stderr2, status2 = Open3.capture3('./adb -s '+device_id+' shell svc data disable')
-                              sleep(3)
+                              stdout2, stderr2, status2 = Open3.capture3('./adb -s ' + device_id + ' shell svc data disable')
+                              puts "stderr: #{stderr2}" unless status2.success?  # 오류 출력
+                              sleep(5)  # 네트워크가 안정될 시간을 더 줍니다.
                               puts 'adb -s ' + device_id + ' shell svc data enable'
-                              Open3.capture3('./adb -s '+device_id+' shell svc data enable')
-                              sleep(3)
+                              stdout3, stderr3, status3 = Open3.capture3('./adb -s ' + device_id + ' shell svc data enable')
+                              puts "stderr: #{stderr3}" unless status3.success?  # 오류 출력
+                              sleep(5)  # 네트워크가 안정될 시간을 더 줍니다.
                               puts 'adb ok'
                               sleep(8)
-
+                          
+                              # IP 변경 확인을 위한 람다 함수
                               robot_ip = lambda do
-                                http = HTTP.get('https://www.findip.kr/')
-                                noko = Nokogiri::HTML(http.to_s)
-                                if noko.xpath('/html/body/header/h2').text != @my_ip
-                                    @my_ip = noko.xpath('/html/body/header/h2').text
+                                begin
+                                  # IP 변경 확인
+                                  http = HTTP.get('https://www.findip.kr/')
+                                  noko = Nokogiri::HTML(http.to_s)
+                          
+                                  current_ip = noko.xpath('/html/body/header/h2').text.strip
+                                  if current_ip != @my_ip
+                                    @my_ip = current_ip
                                     puts "IP 변경됨[ #{@my_ip} ]"
-                                else
-                                    puts @my_ip
-                                    puts '제시도...'
-                                    sleep(3)
-                                    robot_ip[]
+                                  else
+                                    puts "현재 IP: #{@my_ip}"
+                                    puts 'IP 변경이 감지되지 않았습니다. 다시 시도합니다...'
+                                    sleep(5)  # 여유롭게 대기 시간 증가
+                                    robot_ip[]  # 재시도
+                                  end
+                                rescue HTTP::ConnectionError => e
+                                  puts "네트워크 오류 발생: #{e.message}. 재시도 중..."
+                                  sleep(5)  # 재시도 간 여유 시간 추가
+                                  retry  # 재시도
                                 end
-                            end
-                            robot_ip[]
-
+                              end
+                              robot_ip[]  # IP 확인 시작
                             else
-                                puts 'adb error pass'
+                              puts "adb devices 명령어 실행 실패. stderr: #{stderr}"
                             end
-                        end
+                          end
 
                         check_success = 1
                         @data['table'][index][-1] = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: njongto_zon
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.0.55
 platform: ruby
 authors:
 - zon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-02-21 00:00:00.000000000 Z
 dependencies: []
 description: File to Clipboard gem
 email: mymin26@naver.com