@capgo/capacitor-nfc 7.0.0 → 7.0.3

package/android/src/main/java/app/capgo/nfc/CapacitorNfcPlugin.java

@@ -34,502 +34,503 @@ import org.json.JSONException;
 
 @CapacitorPlugin(name = "CapacitorNfc")
 public class CapacitorNfcPlugin extends Plugin {
-  private static final String TAG = "CapacitorNfcPlugin";
-  private static final String PLUGIN_VERSION = "0.0.1";
-  private static final int DEFAULT_READER_FLAGS =
-    NfcAdapter.FLAG_READER_NFC_A |
-    NfcAdapter.FLAG_READER_NFC_B |
-    NfcAdapter.FLAG_READER_NFC_F |
-    NfcAdapter.FLAG_READER_NFC_V |
-    NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK |
-    NfcAdapter.FLAG_READER_NO_PLATFORM_SOUNDS;
-
-  private NfcAdapter adapter;
-  private final AtomicReference<Tag> lastTag = new AtomicReference<>(null);
-  private final AtomicReference<NdefMessage> lastMessage = new AtomicReference<>(null);
-  private boolean readerModeRequested = false;
-  private boolean readerModeActive = false;
-  private int readerModeFlags = DEFAULT_READER_FLAGS;
-  private NdefMessage sharedMessage = null;
-  private NfcStateReceiver stateReceiver;
-  private final ExecutorService executor = Executors.newSingleThreadExecutor();
-
-  private final NfcAdapter.ReaderCallback readerCallback = this::onTagDiscovered;
-
-  @Override
-  public void load() {
-    adapter = NfcAdapter.getDefaultAdapter(getContext());
-    registerStateReceiver();
-    emitStateChange(adapter != null && adapter.isEnabled() ? NfcAdapter.STATE_ON : NfcAdapter.STATE_OFF);
-  }
-
-  @Override
-  protected void handleOnDestroy() {
-    super.handleOnDestroy();
-    unregisterStateReceiver();
-    executor.shutdownNow();
-  }
-
-  @Override
-  protected void handleOnPause() {
-    super.handleOnPause();
-    if (readerModeActive) {
-      disableReaderMode(false);
-    }
-  }
 
-  @Override
-  protected void handleOnResume() {
-    super.handleOnResume();
-    if (readerModeRequested && !readerModeActive) {
-      enableReaderMode(readerModeFlags);
-    }
-  }
+    private static final String TAG = "CapacitorNfcPlugin";
+    private static final String PLUGIN_VERSION = "0.0.1";
+    private static final int DEFAULT_READER_FLAGS =
+        NfcAdapter.FLAG_READER_NFC_A |
+        NfcAdapter.FLAG_READER_NFC_B |
+        NfcAdapter.FLAG_READER_NFC_F |
+        NfcAdapter.FLAG_READER_NFC_V |
+        NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK |
+        NfcAdapter.FLAG_READER_NO_PLATFORM_SOUNDS;
+
+    private NfcAdapter adapter;
+    private final AtomicReference<Tag> lastTag = new AtomicReference<>(null);
+    private final AtomicReference<NdefMessage> lastMessage = new AtomicReference<>(null);
+    private boolean readerModeRequested = false;
+    private boolean readerModeActive = false;
+    private int readerModeFlags = DEFAULT_READER_FLAGS;
+    private NdefMessage sharedMessage = null;
+    private NfcStateReceiver stateReceiver;
+    private final ExecutorService executor = Executors.newSingleThreadExecutor();
+
+    private final NfcAdapter.ReaderCallback readerCallback = this::onTagDiscovered;
 
-  @PluginMethod
-  public void startScanning(PluginCall call) {
-    if (!ensureAdapterAvailable(call)) {
-      return;
+    @Override
+    public void load() {
+        adapter = NfcAdapter.getDefaultAdapter(getContext());
+        registerStateReceiver();
+        emitStateChange(adapter != null && adapter.isEnabled() ? NfcAdapter.STATE_ON : NfcAdapter.STATE_OFF);
     }
 
-    readerModeFlags = call.getInt("androidReaderModeFlags", DEFAULT_READER_FLAGS);
-    readerModeRequested = true;
-    enableReaderMode(readerModeFlags);
-    call.resolve();
-  }
-
-  @PluginMethod
-  public void stopScanning(PluginCall call) {
-    readerModeRequested = false;
-    disableReaderMode(true);
-    call.resolve();
-  }
-
-  @PluginMethod
-  public void write(PluginCall call) {
-    JSONArray records = call.getArray("records");
-    boolean allowFormat = call.getBoolean("allowFormat", true);
-
-    if (records == null) {
-      call.reject("records is required");
-      return;
+    @Override
+    protected void handleOnDestroy() {
+        super.handleOnDestroy();
+        unregisterStateReceiver();
+        executor.shutdownNow();
     }
 
-    Tag tag = lastTag.get();
-    if (tag == null) {
-      call.reject("No NFC tag available. Call startScanning and tap a tag before attempting to write.");
-      return;
+    @Override
+    protected void handleOnPause() {
+        super.handleOnPause();
+        if (readerModeActive) {
+            disableReaderMode(false);
+        }
     }
 
-    try {
-      NdefMessage message = NfcJsonConverter.jsonArrayToMessage(records);
-      performWrite(call, tag, message, allowFormat);
-    } catch (JSONException e) {
-      call.reject("Invalid NDEF records payload", e);
+    @Override
+    protected void handleOnResume() {
+        super.handleOnResume();
+        if (readerModeRequested && !readerModeActive) {
+            enableReaderMode(readerModeFlags);
+        }
     }
-  }
-
-  @PluginMethod
-  public void erase(PluginCall call) {
-    Tag tag = lastTag.get();
-    if (tag == null) {
-      call.reject("No NFC tag available. Call startScanning and tap a tag before attempting to erase.");
-      return;
+
+    @PluginMethod
+    public void startScanning(PluginCall call) {
+        if (!ensureAdapterAvailable(call)) {
+            return;
+        }
+
+        readerModeFlags = call.getInt("androidReaderModeFlags", DEFAULT_READER_FLAGS);
+        readerModeRequested = true;
+        enableReaderMode(readerModeFlags);
+        call.resolve();
     }
 
-    NdefRecord empty = new NdefRecord(NdefRecord.TNF_EMPTY, new byte[0], new byte[0], new byte[0]);
-    NdefMessage message = new NdefMessage(new NdefRecord[] { empty });
-    performWrite(call, tag, message, true);
-  }
-
-  @PluginMethod
-  public void makeReadOnly(PluginCall call) {
-    Tag tag = lastTag.get();
-    if (tag == null) {
-      call.reject("No NFC tag available. Scan a tag before attempting to lock it.");
-      return;
+    @PluginMethod
+    public void stopScanning(PluginCall call) {
+        readerModeRequested = false;
+        disableReaderMode(true);
+        call.resolve();
     }
 
-    executor.execute(() -> {
-        Ndef ndef = Ndef.get(tag);
-        if (ndef == null) {
-          call.reject("Tag does not support NDEF.");
-          return;
+    @PluginMethod
+    public void write(PluginCall call) {
+        JSONArray records = call.getArray("records");
+        boolean allowFormat = call.getBoolean("allowFormat", true);
+
+        if (records == null) {
+            call.reject("records is required");
+            return;
+        }
+
+        Tag tag = lastTag.get();
+        if (tag == null) {
+            call.reject("No NFC tag available. Call startScanning and tap a tag before attempting to write.");
+            return;
         }
 
         try {
-          ndef.connect();
-          boolean success = ndef.makeReadOnly();
-          ndef.close();
-          if (success) {
-            call.resolve();
-          } else {
-            call.reject("Failed to make the tag read only.");
-          }
-        } catch (IOException e) {
-          call.reject("Failed to make the tag read only.", e);
-        }
-      });
-  }
-
-  @PluginMethod
-  public void share(PluginCall call) {
-    if (!ensureAdapterAvailable(call)) {
-      return;
+            NdefMessage message = NfcJsonConverter.jsonArrayToMessage(records);
+            performWrite(call, tag, message, allowFormat);
+        } catch (JSONException e) {
+            call.reject("Invalid NDEF records payload", e);
+        }
     }
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      call.reject("Peer-to-peer NFC sharing is not supported on Android 10 or later.");
-      return;
+    @PluginMethod
+    public void erase(PluginCall call) {
+        Tag tag = lastTag.get();
+        if (tag == null) {
+            call.reject("No NFC tag available. Call startScanning and tap a tag before attempting to erase.");
+            return;
+        }
+
+        NdefRecord empty = new NdefRecord(NdefRecord.TNF_EMPTY, new byte[0], new byte[0], new byte[0]);
+        NdefMessage message = new NdefMessage(new NdefRecord[] { empty });
+        performWrite(call, tag, message, true);
     }
 
-    JSArray records = call.getArray("records");
-    if (records == null) {
-      call.reject("records is required");
-      return;
+    @PluginMethod
+    public void makeReadOnly(PluginCall call) {
+        Tag tag = lastTag.get();
+        if (tag == null) {
+            call.reject("No NFC tag available. Scan a tag before attempting to lock it.");
+            return;
+        }
+
+        executor.execute(() -> {
+            Ndef ndef = Ndef.get(tag);
+            if (ndef == null) {
+                call.reject("Tag does not support NDEF.");
+                return;
+            }
+
+            try {
+                ndef.connect();
+                boolean success = ndef.makeReadOnly();
+                ndef.close();
+                if (success) {
+                    call.resolve();
+                } else {
+                    call.reject("Failed to make the tag read only.");
+                }
+            } catch (IOException e) {
+                call.reject("Failed to make the tag read only.", e);
+            }
+        });
     }
 
-    try {
-      NdefMessage message = NfcJsonConverter.jsonArrayToMessage(records);
-      Activity activity = getActivity();
-      if (activity == null) {
-        call.reject("Unable to access activity context.");
-        return;
-      }
+    @PluginMethod
+    public void share(PluginCall call) {
+        if (!ensureAdapterAvailable(call)) {
+            return;
+        }
 
-      activity.runOnUiThread(() -> {
-        try {
-          if (!isNdefPushEnabled(adapter)) {
-            call.reject("NDEF push is disabled on this device.");
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            call.reject("Peer-to-peer NFC sharing is not supported on Android 10 or later.");
             return;
-          }
-          setNdefPushMessage(adapter, message, activity);
-          sharedMessage = message;
-          call.resolve();
-        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
-          Log.w(TAG, "NDEF push API unavailable on this device", ex);
-          call.reject("NDEF push is not available on this device.");
-        }
-      });
-    } catch (JSONException e) {
-      call.reject("Invalid NDEF records payload", e);
-    }
-  }
+        }
 
-  @PluginMethod
-  public void unshare(PluginCall call) {
-    if (!ensureAdapterAvailable(call)) {
-      return;
-    }
+        JSArray records = call.getArray("records");
+        if (records == null) {
+            call.reject("records is required");
+            return;
+        }
 
-    Activity activity = getActivity();
-    if (activity == null) {
-      call.reject("Unable to access activity context.");
-      return;
+        try {
+            NdefMessage message = NfcJsonConverter.jsonArrayToMessage(records);
+            Activity activity = getActivity();
+            if (activity == null) {
+                call.reject("Unable to access activity context.");
+                return;
+            }
+
+            activity.runOnUiThread(() -> {
+                try {
+                    if (!isNdefPushEnabled(adapter)) {
+                        call.reject("NDEF push is disabled on this device.");
+                        return;
+                    }
+                    setNdefPushMessage(adapter, message, activity);
+                    sharedMessage = message;
+                    call.resolve();
+                } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
+                    Log.w(TAG, "NDEF push API unavailable on this device", ex);
+                    call.reject("NDEF push is not available on this device.");
+                }
+            });
+        } catch (JSONException e) {
+            call.reject("Invalid NDEF records payload", e);
+        }
     }
 
-    activity.runOnUiThread(() -> {
-      try {
-        setNdefPushMessage(adapter, null, activity);
-        sharedMessage = null;
-        call.resolve();
-      } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
-        Log.w(TAG, "NDEF push API unavailable on this device", ex);
-        call.reject("Unable to clear shared message on this device.");
-      }
-    });
-  }
-
-  @PluginMethod
-  public void getStatus(PluginCall call) {
-    JSObject result = new JSObject();
-    result.put("status", getNfcStatus());
-    call.resolve(result);
-  }
-
-  @PluginMethod
-  public void showSettings(PluginCall call) {
-    Activity activity = getActivity();
-    if (activity == null) {
-      call.reject("Unable to open settings without an activity context.");
-      return;
+    @PluginMethod
+    public void unshare(PluginCall call) {
+        if (!ensureAdapterAvailable(call)) {
+            return;
+        }
+
+        Activity activity = getActivity();
+        if (activity == null) {
+            call.reject("Unable to access activity context.");
+            return;
+        }
+
+        activity.runOnUiThread(() -> {
+            try {
+                setNdefPushMessage(adapter, null, activity);
+                sharedMessage = null;
+                call.resolve();
+            } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
+                Log.w(TAG, "NDEF push API unavailable on this device", ex);
+                call.reject("Unable to clear shared message on this device.");
+            }
+        });
     }
 
-    Intent intent = new Intent(Settings.ACTION_NFC_SETTINGS);
-    try {
-      activity.startActivity(intent);
-    } catch (ActivityNotFoundException ex) {
-      Intent fallback = new Intent(Settings.ACTION_WIRELESS_SETTINGS);
-      try {
-        activity.startActivity(fallback);
-      } catch (ActivityNotFoundException secondary) {
-        call.reject("Unable to open NFC settings on this device.");
-        return;
-      }
+    @PluginMethod
+    public void getStatus(PluginCall call) {
+        JSObject result = new JSObject();
+        result.put("status", getNfcStatus());
+        call.resolve(result);
     }
-    call.resolve();
-  }
-
-  @PluginMethod
-  public void getPluginVersion(PluginCall call) {
-    JSObject result = new JSObject();
-    result.put("version", PLUGIN_VERSION);
-    call.resolve(result);
-  }
-
-  private void performWrite(PluginCall call, Tag tag, NdefMessage message, boolean allowFormat) {
-    executor.execute(() -> {
-        Ndef ndef = Ndef.get(tag);
+
+    @PluginMethod
+    public void showSettings(PluginCall call) {
+        Activity activity = getActivity();
+        if (activity == null) {
+            call.reject("Unable to open settings without an activity context.");
+            return;
+        }
+
+        Intent intent = new Intent(Settings.ACTION_NFC_SETTINGS);
         try {
-          if (ndef != null) {
-            ndef.connect();
-            if (!ndef.isWritable()) {
-              call.reject("Tag is read only.");
-            } else if (ndef.getMaxSize() < message.toByteArray().length) {
-              call.reject("Tag capacity is insufficient for the provided message.");
-            } else {
-              ndef.writeNdefMessage(message);
-              call.resolve();
-            }
-            ndef.close();
-          } else if (allowFormat) {
-            NdefFormatable formatable = NdefFormatable.get(tag);
-            if (formatable != null) {
-              formatable.connect();
-              formatable.format(message);
-              formatable.close();
-              call.resolve();
-            } else {
-              call.reject("Tag does not support NDEF formatting.");
+            activity.startActivity(intent);
+        } catch (ActivityNotFoundException ex) {
+            Intent fallback = new Intent(Settings.ACTION_WIRELESS_SETTINGS);
+            try {
+                activity.startActivity(fallback);
+            } catch (ActivityNotFoundException secondary) {
+                call.reject("Unable to open NFC settings on this device.");
+                return;
             }
-          } else {
-            call.reject("Tag does not support NDEF.");
-          }
-        } catch (IOException | FormatException e) {
-          call.reject("Failed to write NDEF message.", e);
-        }
-      });
-  }
-
-  private void enableReaderMode(int flags) {
-    Activity activity = getActivity();
-    if (activity == null || adapter == null) {
-      return;
+        }
+        call.resolve();
     }
 
-    Bundle extras = new Bundle();
-    extras.putInt(NfcAdapter.EXTRA_READER_PRESENCE_CHECK_DELAY, 100);
-
-    activity.runOnUiThread(() -> {
-      try {
-        adapter.enableReaderMode(activity, readerCallback, flags, extras);
-        readerModeActive = true;
-      } catch (IllegalStateException ex) {
-        Log.w(TAG, "Failed to enable reader mode", ex);
-      }
-    });
-  }
-
-  private void disableReaderMode(boolean clearRequested) {
-    Activity activity = getActivity();
-    if (activity == null || adapter == null) {
-      return;
+    @PluginMethod
+    public void getPluginVersion(PluginCall call) {
+        JSObject result = new JSObject();
+        result.put("version", PLUGIN_VERSION);
+        call.resolve(result);
+    }
+
+    private void performWrite(PluginCall call, Tag tag, NdefMessage message, boolean allowFormat) {
+        executor.execute(() -> {
+            Ndef ndef = Ndef.get(tag);
+            try {
+                if (ndef != null) {
+                    ndef.connect();
+                    if (!ndef.isWritable()) {
+                        call.reject("Tag is read only.");
+                    } else if (ndef.getMaxSize() < message.toByteArray().length) {
+                        call.reject("Tag capacity is insufficient for the provided message.");
+                    } else {
+                        ndef.writeNdefMessage(message);
+                        call.resolve();
+                    }
+                    ndef.close();
+                } else if (allowFormat) {
+                    NdefFormatable formatable = NdefFormatable.get(tag);
+                    if (formatable != null) {
+                        formatable.connect();
+                        formatable.format(message);
+                        formatable.close();
+                        call.resolve();
+                    } else {
+                        call.reject("Tag does not support NDEF formatting.");
+                    }
+                } else {
+                    call.reject("Tag does not support NDEF.");
+                }
+            } catch (IOException | FormatException e) {
+                call.reject("Failed to write NDEF message.", e);
+            }
+        });
     }
 
-    activity.runOnUiThread(() -> {
-      try {
-        adapter.disableReaderMode(activity);
-      } catch (IllegalStateException ex) {
-        Log.w(TAG, "Failed to disable reader mode", ex);
-      } finally {
-        readerModeActive = false;
-        if (clearRequested) {
-          readerModeRequested = false;
-        }
-      }
-    });
-  }
-
-  private void onTagDiscovered(Tag tag) {
-    if (tag == null) {
-      return;
+    private void enableReaderMode(int flags) {
+        Activity activity = getActivity();
+        if (activity == null || adapter == null) {
+            return;
+        }
+
+        Bundle extras = new Bundle();
+        extras.putInt(NfcAdapter.EXTRA_READER_PRESENCE_CHECK_DELAY, 100);
+
+        activity.runOnUiThread(() -> {
+            try {
+                adapter.enableReaderMode(activity, readerCallback, flags, extras);
+                readerModeActive = true;
+            } catch (IllegalStateException ex) {
+                Log.w(TAG, "Failed to enable reader mode", ex);
+            }
+        });
     }
 
-    Ndef ndef = Ndef.get(tag);
-    NdefMessage cachedMessage = null;
-    if (ndef != null) {
-      try {
-        cachedMessage = ndef.getCachedNdefMessage();
-      } catch (Exception ex) {
-        Log.w(TAG, "Unable to fetch cached NDEF message", ex);
-      }
+    private void disableReaderMode(boolean clearRequested) {
+        Activity activity = getActivity();
+        if (activity == null || adapter == null) {
+            return;
+        }
+
+        activity.runOnUiThread(() -> {
+            try {
+                adapter.disableReaderMode(activity);
+            } catch (IllegalStateException ex) {
+                Log.w(TAG, "Failed to disable reader mode", ex);
+            } finally {
+                readerModeActive = false;
+                if (clearRequested) {
+                    readerModeRequested = false;
+                }
+            }
+        });
     }
 
-    lastTag.set(tag);
-    lastMessage.set(cachedMessage);
+    private void onTagDiscovered(Tag tag) {
+        if (tag == null) {
+            return;
+        }
 
-    JSObject tagJson = NfcJsonConverter.tagToJSObject(tag, cachedMessage);
-    String eventType = determineEventType(tag, cachedMessage);
-    JSObject event = new JSObject();
-    event.put("type", eventType);
-    event.put("tag", tagJson);
+        Ndef ndef = Ndef.get(tag);
+        NdefMessage cachedMessage = null;
+        if (ndef != null) {
+            try {
+                cachedMessage = ndef.getCachedNdefMessage();
+            } catch (Exception ex) {
+                Log.w(TAG, "Unable to fetch cached NDEF message", ex);
+            }
+        }
 
-    Activity activity = getActivity();
-    if (activity == null) {
-      return;
-    }
+        lastTag.set(tag);
+        lastMessage.set(cachedMessage);
 
-    activity.runOnUiThread(() -> emitEvents(eventType, event));
-  }
-
-  private void emitEvents(String eventType, JSObject payload) {
-    notifyListeners("nfcEvent", payload, true);
-    switch (eventType) {
-      case "tag":
-        notifyListeners("tagDiscovered", payload, true);
-        break;
-      case "ndef":
-        notifyListeners("ndefDiscovered", payload, true);
-        break;
-      case "ndef-mime":
-        notifyListeners("ndefMimeDiscovered", payload, true);
-        break;
-      case "ndef-formatable":
-        notifyListeners("ndefFormatableDiscovered", payload, true);
-        break;
-      default:
-        break;
-    }
-  }
+        JSObject tagJson = NfcJsonConverter.tagToJSObject(tag, cachedMessage);
+        String eventType = determineEventType(tag, cachedMessage);
+        JSObject event = new JSObject();
+        event.put("type", eventType);
+        event.put("tag", tagJson);
 
-  private String determineEventType(Tag tag, NdefMessage message) {
-    if (tag == null) {
-      return "tag";
-    }
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
 
-    if (message != null) {
-      if (Arrays.stream(message.getRecords()).anyMatch(record -> record.getTnf() == NdefRecord.TNF_MIME_MEDIA)) {
-        return "ndef-mime";
-      }
-      return "ndef";
+        activity.runOnUiThread(() -> emitEvents(eventType, event));
+    }
+
+    private void emitEvents(String eventType, JSObject payload) {
+        notifyListeners("nfcEvent", payload, true);
+        switch (eventType) {
+            case "tag":
+                notifyListeners("tagDiscovered", payload, true);
+                break;
+            case "ndef":
+                notifyListeners("ndefDiscovered", payload, true);
+                break;
+            case "ndef-mime":
+                notifyListeners("ndefMimeDiscovered", payload, true);
+                break;
+            case "ndef-formatable":
+                notifyListeners("ndefFormatableDiscovered", payload, true);
+                break;
+            default:
+                break;
+        }
     }
 
-    if (Arrays.asList(tag.getTechList()).contains(NdefFormatable.class.getName())) {
-      return "ndef-formatable";
-    }
+    private String determineEventType(Tag tag, NdefMessage message) {
+        if (tag == null) {
+            return "tag";
+        }
 
-    return "tag";
-  }
+        if (message != null) {
+            if (Arrays.stream(message.getRecords()).anyMatch((record) -> record.getTnf() == NdefRecord.TNF_MIME_MEDIA)) {
+                return "ndef-mime";
+            }
+            return "ndef";
+        }
 
-  private boolean ensureAdapterAvailable(PluginCall call) {
-    if (adapter == null) {
-      call.reject("NFC hardware not available on this device.", "NO_NFC");
-      return false;
-    }
-    if (!adapter.isEnabled()) {
-      call.reject("NFC is currently disabled.", "NFC_DISABLED");
-      return false;
-    }
-    return true;
-  }
+        if (Arrays.asList(tag.getTechList()).contains(NdefFormatable.class.getName())) {
+            return "ndef-formatable";
+        }
 
-  private String getNfcStatus() {
-    if (adapter == null) {
-      return "NO_NFC";
+        return "tag";
     }
-    if (!adapter.isEnabled()) {
-      return "NFC_DISABLED";
+
+    private boolean ensureAdapterAvailable(PluginCall call) {
+        if (adapter == null) {
+            call.reject("NFC hardware not available on this device.", "NO_NFC");
+            return false;
+        }
+        if (!adapter.isEnabled()) {
+            call.reject("NFC is currently disabled.", "NFC_DISABLED");
+            return false;
+        }
+        return true;
     }
-    return "NFC_OK";
-  }
-
-  private boolean isNdefPushEnabled(NfcAdapter adapter)
-    throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-    Method method = NfcAdapter.class.getMethod("isNdefPushEnabled");
-    Object result = method.invoke(adapter);
-    return result instanceof Boolean && (Boolean) result;
-  }
-
-  private void setNdefPushMessage(NfcAdapter adapter, NdefMessage message, Activity activity)
-    throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-    Method method = NfcAdapter.class.getMethod("setNdefPushMessage", NdefMessage.class, Activity.class, Activity[].class);
-    method.invoke(adapter, message, activity, new Activity[0]);
-  }
-
-  private void registerStateReceiver() {
-    if (stateReceiver != null) {
-      return;
+
+    private String getNfcStatus() {
+        if (adapter == null) {
+            return "NO_NFC";
+        }
+        if (!adapter.isEnabled()) {
+            return "NFC_DISABLED";
+        }
+        return "NFC_OK";
     }
 
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      return;
+    private boolean isNdefPushEnabled(NfcAdapter adapter) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        Method method = NfcAdapter.class.getMethod("isNdefPushEnabled");
+        Object result = method.invoke(adapter);
+        return result instanceof Boolean && (Boolean) result;
     }
 
-    Context context = getContext();
-    if (context == null) {
-      return;
+    private void setNdefPushMessage(NfcAdapter adapter, NdefMessage message, Activity activity)
+        throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        Method method = NfcAdapter.class.getMethod("setNdefPushMessage", NdefMessage.class, Activity.class, Activity[].class);
+        method.invoke(adapter, message, activity, new Activity[0]);
     }
 
-    stateReceiver = new NfcStateReceiver(this::emitStateChange);
-    IntentFilter filter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
-    context.registerReceiver(stateReceiver, filter);
-  }
+    private void registerStateReceiver() {
+        if (stateReceiver != null) {
+            return;
+        }
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            return;
+        }
 
-  private void unregisterStateReceiver() {
-    if (stateReceiver == null) {
-      return;
-    }
-    Context context = getContext();
-    if (context != null) {
-      context.unregisterReceiver(stateReceiver);
+        Context context = getContext();
+        if (context == null) {
+            return;
+        }
+
+        stateReceiver = new NfcStateReceiver(this::emitStateChange);
+        IntentFilter filter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
+        context.registerReceiver(stateReceiver, filter);
     }
-    stateReceiver = null;
-  }
-
-  private void emitStateChange(int state) {
-    String status;
-    boolean enabled;
-    switch (state) {
-      case NfcAdapter.STATE_ON:
-        status = "NFC_OK";
-        enabled = true;
-        break;
-      case NfcAdapter.STATE_OFF:
-        status = adapter == null ? "NO_NFC" : "NFC_DISABLED";
-        enabled = false;
-        break;
-      default:
-        status = getNfcStatus();
-        enabled = adapter != null && adapter.isEnabled();
-        break;
+
+    private void unregisterStateReceiver() {
+        if (stateReceiver == null) {
+            return;
+        }
+        Context context = getContext();
+        if (context != null) {
+            context.unregisterReceiver(stateReceiver);
+        }
+        stateReceiver = null;
+    }
+
+    private void emitStateChange(int state) {
+        String status;
+        boolean enabled;
+        switch (state) {
+            case NfcAdapter.STATE_ON:
+                status = "NFC_OK";
+                enabled = true;
+                break;
+            case NfcAdapter.STATE_OFF:
+                status = adapter == null ? "NO_NFC" : "NFC_DISABLED";
+                enabled = false;
+                break;
+            default:
+                status = getNfcStatus();
+                enabled = adapter != null && adapter.isEnabled();
+                break;
+        }
+
+        JSObject payload = new JSObject();
+        payload.put("status", status);
+        payload.put("enabled", enabled);
+        notifyListeners("nfcStateChange", payload, true);
     }
 
-    JSObject payload = new JSObject();
-    payload.put("status", status);
-    payload.put("enabled", enabled);
-    notifyListeners("nfcStateChange", payload, true);
-  }
+    private static class NfcStateReceiver extends android.content.BroadcastReceiver {
 
-  private static class NfcStateReceiver extends android.content.BroadcastReceiver {
-    private final StateCallback callback;
+        private final StateCallback callback;
 
-    NfcStateReceiver(StateCallback callback) {
-      this.callback = callback;
-    }
+        NfcStateReceiver(StateCallback callback) {
+            this.callback = callback;
+        }
 
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      if (intent == null || !NfcAdapter.ACTION_ADAPTER_STATE_CHANGED.equals(intent.getAction())) {
-        return;
-      }
-      int state = intent.getIntExtra(NfcAdapter.EXTRA_ADAPTER_STATE, NfcAdapter.STATE_OFF);
-      if (callback != null) {
-        callback.onStateChanged(state);
-      }
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent == null || !NfcAdapter.ACTION_ADAPTER_STATE_CHANGED.equals(intent.getAction())) {
+                return;
+            }
+            int state = intent.getIntExtra(NfcAdapter.EXTRA_ADAPTER_STATE, NfcAdapter.STATE_OFF);
+            if (callback != null) {
+                callback.onStateChanged(state);
+            }
+        }
     }
-  }
 
-  private interface StateCallback {
-    void onStateChanged(int state);
-  }
+    private interface StateCallback {
+        void onStateChanged(int state);
+    }
 }

package/android/src/main/java/app/capgo/nfc/NfcJsonConverter.java

@@ -11,125 +11,126 @@ import org.json.JSONArray;
 import org.json.JSONException;
 
 final class NfcJsonConverter {
-  private static final String TAG = "CapacitorNfcJson";
 
-  private NfcJsonConverter() {}
+    private static final String TAG = "CapacitorNfcJson";
 
-  static JSObject tagToJSObject(Tag tag, NdefMessage cachedMessage) {
-    JSObject result = new JSObject();
-    if (tag != null) {
-      result.put("id", byteArrayToJSONArray(tag.getId()));
-      result.put("techTypes", techTypesToArray(tag.getTechList()));
-    }
+    private NfcJsonConverter() {}
 
-    if (tag != null) {
-      Ndef ndef = Ndef.get(tag);
-      if (ndef != null) {
-        result.put("type", translateType(ndef.getType()));
-        result.put("maxSize", ndef.getMaxSize());
-        result.put("isWritable", ndef.isWritable());
-        try {
-          result.put("canMakeReadOnly", ndef.canMakeReadOnly());
-        } catch (NullPointerException e) {
-          result.put("canMakeReadOnly", JSObject.NULL);
+    static JSObject tagToJSObject(Tag tag, NdefMessage cachedMessage) {
+        JSObject result = new JSObject();
+        if (tag != null) {
+            result.put("id", byteArrayToJSONArray(tag.getId()));
+            result.put("techTypes", techTypesToArray(tag.getTechList()));
         }
-      }
-    }
 
-    if (cachedMessage != null) {
-      result.put("ndefMessage", messageToJSONArray(cachedMessage));
-    }
+        if (tag != null) {
+            Ndef ndef = Ndef.get(tag);
+            if (ndef != null) {
+                result.put("type", translateType(ndef.getType()));
+                result.put("maxSize", ndef.getMaxSize());
+                result.put("isWritable", ndef.isWritable());
+                try {
+                    result.put("canMakeReadOnly", ndef.canMakeReadOnly());
+                } catch (NullPointerException e) {
+                    result.put("canMakeReadOnly", JSObject.NULL);
+                }
+            }
+        }
 
-    return result;
-  }
+        if (cachedMessage != null) {
+            result.put("ndefMessage", messageToJSONArray(cachedMessage));
+        }
 
-  static JSONArray messageToJSONArray(NdefMessage message) {
-    if (message == null) {
-      return null;
+        return result;
     }
 
-    JSArray array = new JSArray();
-    for (NdefRecord record : message.getRecords()) {
-      array.put(recordToJSObject(record));
-    }
-    return array;
-  }
-
-  static JSObject recordToJSObject(NdefRecord record) {
-    JSObject obj = new JSObject();
-    obj.put("tnf", record.getTnf());
-    obj.put("type", byteArrayToJSONArray(record.getType()));
-    obj.put("id", byteArrayToJSONArray(record.getId()));
-    obj.put("payload", byteArrayToJSONArray(record.getPayload()));
-    return obj;
-  }
-
-  static JSONArray byteArrayToJSONArray(byte[] bytes) {
-    if (bytes == null) {
-      return null;
-    }
-    JSArray array = new JSArray();
-    for (byte aByte : bytes) {
-      array.put(aByte & 0xFF);
-    }
-    return array;
-  }
+    static JSONArray messageToJSONArray(NdefMessage message) {
+        if (message == null) {
+            return null;
+        }
 
-  private static JSArray techTypesToArray(String[] techTypes) {
-    JSArray array = new JSArray();
-    if (techTypes != null) {
-      Arrays.stream(techTypes).forEach(array::put);
+        JSArray array = new JSArray();
+        for (NdefRecord record : message.getRecords()) {
+            array.put(recordToJSObject(record));
+        }
+        return array;
     }
-    return array;
-  }
 
-  static String translateType(String type) {
-    if (type == null) {
-      return null;
+    static JSObject recordToJSObject(NdefRecord record) {
+        JSObject obj = new JSObject();
+        obj.put("tnf", record.getTnf());
+        obj.put("type", byteArrayToJSONArray(record.getType()));
+        obj.put("id", byteArrayToJSONArray(record.getId()));
+        obj.put("payload", byteArrayToJSONArray(record.getPayload()));
+        return obj;
     }
-    switch (type) {
-      case Ndef.NFC_FORUM_TYPE_1:
-        return "NFC Forum Type 1";
-      case Ndef.NFC_FORUM_TYPE_2:
-        return "NFC Forum Type 2";
-      case Ndef.NFC_FORUM_TYPE_3:
-        return "NFC Forum Type 3";
-      case Ndef.NFC_FORUM_TYPE_4:
-        return "NFC Forum Type 4";
-      default:
-        return type;
+
+    static JSONArray byteArrayToJSONArray(byte[] bytes) {
+        if (bytes == null) {
+            return null;
+        }
+        JSArray array = new JSArray();
+        for (byte aByte : bytes) {
+            array.put(aByte & 0xFF);
+        }
+        return array;
     }
-  }
 
-  static NdefMessage jsonArrayToMessage(JSONArray records) throws JSONException {
-    if (records == null || records.length() == 0) {
-      throw new JSONException("records must be a non-empty array");
+    private static JSArray techTypesToArray(String[] techTypes) {
+        JSArray array = new JSArray();
+        if (techTypes != null) {
+            Arrays.stream(techTypes).forEach(array::put);
+        }
+        return array;
     }
-    NdefRecord[] ndefRecords = new NdefRecord[records.length()];
-    for (int i = 0; i < records.length(); i++) {
-      JSObject record = JSObject.fromJSONObject(records.getJSONObject(i));
-      Integer tnfValue = record.getInteger("tnf");
-      if (tnfValue == null) {
-        throw new JSONException("Each record must include a tnf field.");
-      }
-      short tnf = (short) tnfValue.intValue();
-      byte[] type = jsonArrayToBytes(record.optJSONArray("type"));
-      byte[] id = jsonArrayToBytes(record.optJSONArray("id"));
-      byte[] payload = jsonArrayToBytes(record.optJSONArray("payload"));
-      ndefRecords[i] = new NdefRecord(tnf, type, id, payload);
+
+    static String translateType(String type) {
+        if (type == null) {
+            return null;
+        }
+        switch (type) {
+            case Ndef.NFC_FORUM_TYPE_1:
+                return "NFC Forum Type 1";
+            case Ndef.NFC_FORUM_TYPE_2:
+                return "NFC Forum Type 2";
+            case Ndef.NFC_FORUM_TYPE_3:
+                return "NFC Forum Type 3";
+            case Ndef.NFC_FORUM_TYPE_4:
+                return "NFC Forum Type 4";
+            default:
+                return type;
+        }
     }
-    return new NdefMessage(ndefRecords);
-  }
 
-  static byte[] jsonArrayToBytes(JSONArray array) throws JSONException {
-    if (array == null) {
-      return new byte[0];
+    static NdefMessage jsonArrayToMessage(JSONArray records) throws JSONException {
+        if (records == null || records.length() == 0) {
+            throw new JSONException("records must be a non-empty array");
+        }
+        NdefRecord[] ndefRecords = new NdefRecord[records.length()];
+        for (int i = 0; i < records.length(); i++) {
+            JSObject record = JSObject.fromJSONObject(records.getJSONObject(i));
+            Integer tnfValue = record.getInteger("tnf");
+            if (tnfValue == null) {
+                throw new JSONException("Each record must include a tnf field.");
+            }
+            short tnf = (short) tnfValue.intValue();
+            byte[] type = jsonArrayToBytes(record.optJSONArray("type"));
+            byte[] id = jsonArrayToBytes(record.optJSONArray("id"));
+            byte[] payload = jsonArrayToBytes(record.optJSONArray("payload"));
+            ndefRecords[i] = new NdefRecord(tnf, type, id, payload);
+        }
+        return new NdefMessage(ndefRecords);
     }
-    byte[] bytes = new byte[array.length()];
-    for (int i = 0; i < array.length(); i++) {
-      int value = array.getInt(i);
-      bytes[i] = (byte) (value & 0xFF);
+
+    static byte[] jsonArrayToBytes(JSONArray array) throws JSONException {
+        if (array == null) {
+            return new byte[0];
+        }
+        byte[] bytes = new byte[array.length()];
+        for (int i = 0; i < array.length(); i++) {
+            int value = array.getInt(i);
+            bytes[i] = (byte) (value & 0xFF);
+        }
+        return bytes;
     }
-    return bytes;
-  }
 }

package/dist/esm/web.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAY5C,MAAM,OAAO,eAAgB,SAAQ,SAAS;IACpC,WAAW,CAAC,MAAc;QAChC,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,MAAM,6CAA6C,CAAC,CAAC;IAChG,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,QAA+B;QACjD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAyB;QACnC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAyB;QACnC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAClC,CAAC;IAcD,KAAK,CAAC,WAAW,CAAC,SAAiB,EAAE,aAAuC;QAC1E,IAAI,CAAC,WAAW,CAAC,eAAe,SAAS,GAAG,CAAC,CAAC;IAChD,CAAC;CACF","sourcesContent":["import { WebPlugin } from '@capacitor/core';\n\nimport type {\n  CapacitorNfcPlugin,\n  NfcStateChangeEvent,\n  NfcEvent,\n  ShareTagOptions,\n  StartScanningOptions,\n  WriteTagOptions,\n  PluginListenerHandle,\n} from './definitions';\n\nexport class CapacitorNfcWeb extends WebPlugin implements CapacitorNfcPlugin {\n  private unsupported(method: string): never {\n    throw this.unimplemented(`CapacitorNfc.${method} is not available in a browser environment.`);\n  }\n\n  async startScanning(_options?: StartScanningOptions): Promise<void> {\n    this.unsupported('startScanning');\n  }\n\n  async stopScanning(): Promise<void> {\n    this.unsupported('stopScanning');\n  }\n\n  async write(_options: WriteTagOptions): Promise<void> {\n    this.unsupported('write');\n  }\n\n  async erase(): Promise<void> {\n    this.unsupported('erase');\n  }\n\n  async makeReadOnly(): Promise<void> {\n    this.unsupported('makeReadOnly');\n  }\n\n  async share(_options: ShareTagOptions): Promise<void> {\n    this.unsupported('share');\n  }\n\n  async unshare(): Promise<void> {\n    this.unsupported('unshare');\n  }\n\n  async getStatus(): Promise<{ status: 'NO_NFC' }> {\n    return { status: 'NO_NFC' };\n  }\n\n  async showSettings(): Promise<void> {\n    this.unsupported('showSettings');\n  }\n\n  async getPluginVersion(): Promise<{ version: string }> {\n    return { version: '0.0.0-web' };\n  }\n\n  addListener(\n    eventName: 'nfcEvent',\n    listenerFunc: (event: NfcEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    eventName: 'tagDiscovered' | 'ndefDiscovered' | 'ndefMimeDiscovered' | 'ndefFormatableDiscovered',\n    listenerFunc: (event: NfcEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    eventName: 'nfcStateChange',\n    listenerFunc: (event: NfcStateChangeEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  async addListener(eventName: string, _listenerFunc: (..._args: any[]) => any): Promise<PluginListenerHandle> {\n    this.unsupported(`addListener(${eventName})`);\n  }\n}\n"]}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAY5C,MAAM,OAAO,eAAgB,SAAQ,SAAS;IACpC,WAAW,CAAC,MAAc;QAChC,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,MAAM,6CAA6C,CAAC,CAAC;IAChG,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,QAA+B;QACjD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAyB;QACnC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAyB;QACnC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAClC,CAAC;IAWD,KAAK,CAAC,WAAW,CAAC,SAAiB,EAAE,aAAuC;QAC1E,IAAI,CAAC,WAAW,CAAC,eAAe,SAAS,GAAG,CAAC,CAAC;IAChD,CAAC;CACF","sourcesContent":["import { WebPlugin } from '@capacitor/core';\n\nimport type {\n  CapacitorNfcPlugin,\n  NfcStateChangeEvent,\n  NfcEvent,\n  ShareTagOptions,\n  StartScanningOptions,\n  WriteTagOptions,\n  PluginListenerHandle,\n} from './definitions';\n\nexport class CapacitorNfcWeb extends WebPlugin implements CapacitorNfcPlugin {\n  private unsupported(method: string): never {\n    throw this.unimplemented(`CapacitorNfc.${method} is not available in a browser environment.`);\n  }\n\n  async startScanning(_options?: StartScanningOptions): Promise<void> {\n    this.unsupported('startScanning');\n  }\n\n  async stopScanning(): Promise<void> {\n    this.unsupported('stopScanning');\n  }\n\n  async write(_options: WriteTagOptions): Promise<void> {\n    this.unsupported('write');\n  }\n\n  async erase(): Promise<void> {\n    this.unsupported('erase');\n  }\n\n  async makeReadOnly(): Promise<void> {\n    this.unsupported('makeReadOnly');\n  }\n\n  async share(_options: ShareTagOptions): Promise<void> {\n    this.unsupported('share');\n  }\n\n  async unshare(): Promise<void> {\n    this.unsupported('unshare');\n  }\n\n  async getStatus(): Promise<{ status: 'NO_NFC' }> {\n    return { status: 'NO_NFC' };\n  }\n\n  async showSettings(): Promise<void> {\n    this.unsupported('showSettings');\n  }\n\n  async getPluginVersion(): Promise<{ version: string }> {\n    return { version: '0.0.0-web' };\n  }\n\n  addListener(eventName: 'nfcEvent', listenerFunc: (event: NfcEvent) => void): Promise<PluginListenerHandle>;\n  addListener(\n    eventName: 'tagDiscovered' | 'ndefDiscovered' | 'ndefMimeDiscovered' | 'ndefFormatableDiscovered',\n    listenerFunc: (event: NfcEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  addListener(\n    eventName: 'nfcStateChange',\n    listenerFunc: (event: NfcStateChangeEvent) => void,\n  ): Promise<PluginListenerHandle>;\n  async addListener(eventName: string, _listenerFunc: (..._args: any[]) => any): Promise<PluginListenerHandle> {\n    this.unsupported(`addListener(${eventName})`);\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-nfc",
-  "version": "7.0.0",
+  "version": "7.0.3",
   "description": "Native NFC tag discovery, reading and writing for Capacitor apps on iOS and Android.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -38,7 +38,7 @@
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
-    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --autocorrect --format",
+    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
     "eslint": "eslint . --ext .ts",
     "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
     "swiftlint": "node-swiftlint",