wifi-wand 2.16.0 → 2.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4729288451e02d7b968dac5ef6bfd703383e3e7a759386ae6b74d82527e2dea6
-  data.tar.gz: '085c16eba0b518c4be31609cfd8847788f8d0e0985ae9b167c41585c66a18182'
+  metadata.gz: fa4d72d84399a3545afdc8a93bae85c4b908c4241e9f6b81611525dd16bb60c6
+  data.tar.gz: 395a8c9a5f33fdc7560a1c77e9cf034dc71257001c6b83947e609e66c039289f
 SHA512:
-  metadata.gz: 83b47a2b64ba1a6b436f38c7da2f546156076891cb73fae03a6b90f57b72119c4d6affd25bff7bac42523fd0e4abfcbf45eb9fb7363739cc9641a7992881fdad
-  data.tar.gz: 365bd3f24ed79803b100ab0785c16a4257dadb18c25f9a8a6c0617eda4e4bba8786104000c559d24932bffc6cda95e428bf617b1c39b50db675b87a8170eabed
+  metadata.gz: b22b21c170675dc09b88d0e27602f36c6d347202222cc89f26fec49527f72b4aa30788ae88234a5d03d0bbd98de024f3999c6b1f5898cdc77d538ea1f9003976
+  data.tar.gz: 6bd48d2bf96327d2b330f88bc9cf48136535ae787a49bf9ebccfe53b0023e1e5699a55e16dabd7c16227f5c056e7ab6674529b736246faae3e0158370fb65190

data/README.md

@@ -69,16 +69,6 @@ When in interactive shell mode:
 Internally, it uses several Mac command line utilities to interact with the
 underlying operating system.
 
-> [!WARNING]  
-> Starting in Mac OS version 14.4, the `airport` utility on which some of this project's
-> functionality relies has been disabled and will presumably eventually be removed.
-> 
-> The following commands will result in a runtime error if `airport` is no longer available:
-> 
-> * listing names of available wifi networks
-> * listing detailed information about available wifi networks
-> * disconnecting from a wifi network
-
 ### Pretty Output
 
 For nicely formatted output of the `info` command in non-interactive mode,
@@ -363,6 +353,21 @@ to create a script for your most commonly used networks containing something lik
 wifi-wand  connect  my-usual-network  its-password
 ```
 
+### Airport Utility Deprecation (April 2024)
+
+Starting in Mac OS version 14.4, the `airport` utility on which some of this project's
+functionality relies has been disabled and will presumably eventually be removed.
+
+The following tasks were restored by using Swift scripts:
+* listing names of all available networks
+* disconnecting from a network (with the added benefit that sudo access is no longer required)
+
+The following tasks were restored by using `networksetup`:
+* determining whether or not wifi is on
+* the name of the currently connected network
+
+The only remaining issue is that we were getting some extended information from airport for each available network.
+
 
 ### License
 

data/RELEASE_NOTES.md

@@ -1,3 +1,7 @@
+## v2.16.1
+
+* Fix airport deprecations' removal of listing all networks and disconnecting from a network by using Swift scripts.
+
 ## v2.16.0 (2024-04)
 
 * Handle deprecation of the `airport` command starting at Mac OS 14.4.

data/lib/wifi-wand/models/mac_os_model.rb

@@ -6,26 +6,6 @@ require 'shellwords'
 require_relative 'base_model'
 require_relative '../error'
 
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# 2024-04-18:
-#
-# Apple has deprecated the 'airport' utility and has already disabled its
-# functionality. This utility is used for the following wifi-wand commands:
-
-# 1) cmd: info, fn: wifi_info - adds information to the info output
-# 2) cmd: avail_nets, fn: available_network_names - available wifi network names
-# 3) cmd: ls_avail_nets, fn: available_network_info - available wifi networks details
-# 4) cmd: wifi_on, fn: wifi_on?
-# 5) cmd: network_name, fn: connected_network_name
-# 6) cmd: disconnect, fn: disconnect
-
-# Functions 4 and 5 have been fixed to use `networksetup` instead of `airport`.
-# The others are not yet fixed.
-
-# An AskDifferent (Mac StackExchange site) question has been posted to
-# https://apple.stackexchange.com/questions/471886/how-to-replace-functionality-of-deprecated-airport-command-line-application.
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 module WifiWand
 
 class MacOsModel < BaseModel
@@ -190,22 +170,9 @@ class MacOsModel < BaseModel
   #
   # REXML is used here to avoid the need for the user to install Nokogiri.
   def available_network_names
-    raise RuntimeError, airport_deprecated_message if airport_deprecated
-
     return nil unless wifi_on? # no need to try
 
-    # For some reason, the airport command very often returns nothing, so we need to try until
-    # we get data in the response:
-
-    command = "#{airport_command} -s -x | iconv -f macroman -t utf-8"
-    stop_condition = ->(response) { ! [nil, ''].include?(response) }
-    output = try_os_command_until(command, stop_condition)
-    doc = REXML::Document.new(output)
-    xpath = '//key[text() = "SSID_STR"][1]/following-sibling::*[1]' # provided by @ScreenStaring on Twitter
-    REXML::XPath.match(doc, xpath) \
-        .map(&:text) \
-        .sort { |x,y| x.casecmp(y) } \
-        .uniq
+    run_swift_command('AvailableWifiNetworkLister').split("\n")
   end
 
 
@@ -323,10 +290,9 @@ class MacOsModel < BaseModel
 
   # Disconnects from the currently connected network. Does not turn off wifi.
   def disconnect
-    raise RuntimeError, airport_deprecated_message if airport_deprecated
-
     return nil unless wifi_on? # no need to try
-    run_os_command("sudo #{airport_command} -z")
+
+    run_swift_command('WifiNetworkDisconecter')
     nil
   end
 
@@ -463,5 +429,13 @@ class MacOsModel < BaseModel
     end
     output.split("\n")
   end
+
+  def run_swift_command(basename)
+    swift_filespec = File.join(
+      File.dirname(__FILE__), "../../../swift/#{basename}.swift"
+    )
+    command = "swift #{swift_filespec}"
+    `#{command}`
+  end
 end
 end

data/lib/wifi-wand/version.rb

@@ -1,3 +1,3 @@
 module WifiWand
-  VERSION = '2.16.0' unless defined?(VERSION)
+  VERSION = '2.16.1' unless defined?(VERSION)
 end

data/swift/AvailableWifiNetworkLister.swift

@@ -0,0 +1,32 @@
+import Foundation
+import CoreWLAN
+
+class NetworkScanner {
+    var currentInterface: CWInterface
+    
+    init?() {
+        // Initialize with the default Wi-Fi interface
+        guard let defaultInterface = CWWiFiClient.shared().interface(),
+              defaultInterface.interfaceName != nil else {
+            return nil
+        }
+        self.currentInterface = defaultInterface
+        self.scanForNetworks()
+    }
+    
+    func scanForNetworks() {
+        do {
+            let networks = try currentInterface.scanForNetworks(withName: nil)
+            for network in networks {
+                print("\(network.ssid ?? "Unknown")")
+            }
+        } catch let error as NSError {
+            print("Error: \(error.localizedDescription)")
+        }
+}
+}
+
+// Usage
+if NetworkScanner() != nil {
+    // The list of available networks will be printed
+}

data/swift/WifiNetworkDisconecter.swift

@@ -0,0 +1,9 @@
+import Foundation
+import CoreWLAN
+
+if let wifiInterface = CWWiFiClient.shared().interface() {
+    wifiInterface.disassociate()
+    print("ok")
+} else {
+    print("error")
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wifi-wand
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.16.1
 platform: ruby
 authors:
 - Keith Bennett
@@ -155,6 +155,8 @@ files:
 - sample-available-networks.json
 - sample-available-networks.yaml
 - spec/wifi-wand/models/base_model_spec.rb
+- swift/AvailableWifiNetworkLister.swift
+- swift/WifiNetworkDisconecter.swift
 - test-data/invalid-byte-sequence-network-names.txt
 - wifi-wand.gemspec
 homepage: https://github.com/keithrbennett/wifiwand