ns-bxl-label 1.0.2 → 1.0.3

package/package.json

@@ -1,17 +1,35 @@
 {
   "name": "ns-bxl-label",
-  "version": "1.0.2",
-  "main": "src/index.ts",
+  "version": "1.0.3",
+  "main": "src/index.js",
+  "types": "src/index.d.ts",
+
   "nativescript": {
     "platforms": {
       "android": "8.0.0"
     }
   },
+
+  "peerDependencies": {
+    "@nativescript/core": "^8.0.0"
+  },
+
   "dependencies": {
-    "@nativescript/core": "^8.0.0",
     "nativescript-permissions": "^1.3.0"
   },
-  "keywords": ["bxl"],
+
+  "files": [
+    "src/",
+    "src/platform-android/",
+    "plugin.xml",
+    "package.json",
+    "README.md"
+  ],
+
+  "keywords": [
+    "bxl"
+  ],
+
   "author": "n",
   "license": "MIT"
-}
+}

package/plugin.xml

@@ -1,15 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <plugin>
     <platforms>
         <android>
-            <framework name="com.bixolon.labelprinter" />
+
+            <!-- Archivos Java del plugin -->
             <files>
                 <file>src/platform-android/com/rivercon/appprintbixolon/PrinterControl/BixolonPrinterConnector.java</file>
                 <file>src/platform-android/com/rivercon/appprintbixolon/PrinterControl/BixolonPrinterManager.java</file>
                 <file>src/platform-android/com/rivercon/appprintbixolon/PrinterControl/LabelPrinterHelper.java</file>
                 <file>src/platform-android/com/rivercon/appprintbixolon/PrinterControl/PrinterDialogManager.java</file>
                 <file>src/platform-android/com/rivercon/appprintbixolon/PrinterControl/PrinterStateListener.java</file>
+
+                <!-- SDK Bixolon -->
                 <file>src/platform-android/libs/bixolon-labelprinter.jar</file>
             </files>
+
+            <!-- Permisos necesarios para Android 12+ -->
+            <manifest>
+                <uses-permission android:name="android.permission.BLUETOOTH" />
+                <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+                <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+                <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+                <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+            </manifest>
+
         </android>
     </platforms>
+
+    <!-- Módulo JS/TS del plugin -->
+    <js-module name="index" path="src/index.js">
+        <android>
+            <!-- Paquete donde vive tu @JavaProxy -->
+            <java-package>com.rivercon.appprintbixolon.PrinterControl</java-package>
+        </android>
+    </js-module>
+
 </plugin>

package/src/index.ts

@@ -2,44 +2,93 @@ import { android as androidApp } from '@nativescript/core/application';
 import { Dialogs } from '@nativescript/core';
 import * as permissions from 'nativescript-permissions';
 
-declare var com: any;
+declare const com: any;
 
-@JavaProxy("com.rivercon.appprintbixolon.PrinterControl.PrinterStateListener")
+export interface PrinterCallbacks {
+onConnectionStateChanged?: (status: string) => void;
+  onPrintStarted?: () => void;
+  onPrintSuccess?: () => void;
+  onPrintError?: (error: string) => void;
+  onConnectionFailed?: (error: string) => void;
+  onConnectionLost?: () => void;
+  showPrintingDialog?: () => void;
+  hidePrintingDialog?: () => void;
+}
+
+@JavaProxy('com.rivercon.appprintbixolon.PrinterControl.PrinterStateListener')
 class PrinterStateListenerImpl extends java.lang.Object implements com.rivercon.appprintbixolon.PrinterControl.PrinterStateListener {
-constructor(private callbacks: {
-    onConnectionStateChanged: (status: string) => void,
-    showPrintingDialog: () => void,
-    hidePrintingDialog: () => void,
-    onPrintError: (error: string) => void
-  }) {
+
+  private callbacks: PrinterCallbacks;
+
+  constructor(callbacks: PrinterCallbacks) {
     super();
+    this.callbacks = callbacks || {};
     return global.__native(this);
   }
 
   public onConnectionStateChanged(status: string): void {
-    this.callbacks.onConnectionStateChanged(status);
+    if (this.callbacks.onConnectionStateChanged) {
+      this.callbacks.onConnectionStateChanged(status);
+    }
   }
 
   public showPrintingDialog(): void {
-    this.callbacks.showPrintingDialog();
+    if (this.callbacks.showPrintingDialog) {
+      this.callbacks.showPrintingDialog();
+    }
   }
 
   public hidePrintingDialog(): void {
-    this.callbacks.hidePrintingDialog();
+    if (this.callbacks.hidePrintingDialog) {
+      this.callbacks.hidePrintingDialog();
+    }
   }
 
   public onPrintError(errorMessage: string): void {
-    this.callbacks.onPrintError(errorMessage);
+    if (this.callbacks.onPrintError) {
+      this.callbacks.onPrintError(errorMessage);
+    }
+  }
+
+  public onConnectionFailed(errorMessage: string): void {
+    if (this.callbacks.onConnectionFailed) {
+      this.callbacks.onConnectionFailed(errorMessage);
+    }
+  }
+
+  public onConnectionLost(): void {
+    if (this.callbacks.onConnectionLost) {
+      this.callbacks.onConnectionLost();
+    }
+  }
+
+  public onPrintSuccess(): void {
+    if (this.callbacks.onPrintSuccess) {
+      this.callbacks.onPrintSuccess();
+    }
   }
 }
 
-export function startBluetoothPrintFlow(zplCommand: string): void {
+/**
+ * Inicia el flujo de impresión Bluetooth sin UI nativa.
+ * MDK se encarga de:
+ *  - Obtener la dirección MAC de la impresora.
+ *  - Mostrar diálogos / loaders / errores al usuario.
+ */
+export function startBluetoothPrintFlow(
+  printerAddress: string,
+  zplCommand: string,
+  callbacks: PrinterCallbacks = {}
+): void {
   const context = androidApp.context;
-  const DialogManager = com.rivercon.appprintbixolon.PrinterControl.PrinterDialogManager;
-  const dialogManager = new DialogManager(context);
 
-  if (!zplCommand || zplCommand.trim() === "") {
-    Dialogs.alert("No hay ZPL para imprimir.");
+  if (!printerAddress || printerAddress.trim() === '') {
+    Dialogs.alert('No se ha especificado la dirección de la impresora.');
+    return;
+  }
+
+  if (!zplCommand || zplCommand.trim() === '') {
+    Dialogs.alert('No hay ZPL para imprimir.');
     return;
   }
 
@@ -49,32 +98,50 @@ export function startBluetoothPrintFlow(zplCommand: string): void {
     android.Manifest.permission.ACCESS_FINE_LOCATION
   ];
 
-  permissions.requestPermissions(requiredPermissions, "Se requieren permisos para imprimir").then(() => {
-    try {
-      dialogManager.showBluetoothDeviceDialog(new java.util.function.Consumer({
-        accept: (selectedAddress: string) => {
-          const listener = new PrinterStateListenerImpl({
-            onConnectionStateChanged: (status) => Dialogs.alert("Estado: " + status),
-            showPrintingDialog: () => dialogManager.showPrintingDialog(),
-            hidePrintingDialog: () => dialogManager.hidePrintingDialog(),
-            onPrintError: (error) => Dialogs.alert("Error: " + error)
-          });
-
-          const Manager = com.rivercon.appprintbixolon.PrinterControl.BixolonPrinterManager;
-          const manager = new Manager(context, listener);
-
-          try {
-            manager.startFullSequence(selectedAddress, zplCommand);
-            Dialogs.alert("Impresión iniciada correctamente.");
-          } catch (e) {
-            Dialogs.alert("Error al iniciar impresión: " + e.message);
+  permissions
+    .requestPermissions(requiredPermissions, 'Se requieren permisos para imprimir')
+    .then(() => {
+      try {
+        // Notificamos que la impresión está por iniciar (opcional)
+        if (callbacks.onPrintStarted) {
+          callbacks.onPrintStarted();
+        }
+
+        const listener = new PrinterStateListenerImpl({
+          onConnectionStateChanged: callbacks.onConnectionStateChanged,
+          showPrintingDialog: callbacks.showPrintingDialog,
+          hidePrintingDialog: callbacks.hidePrintingDialog,
+          onPrintError: callbacks.onPrintError,
+          onConnectionFailed: callbacks.onConnectionFailed,
+          onConnectionLost: callbacks.onConnectionLost,
+          onPrintSuccess: callbacks.onPrintSuccess
+        });
+
+        const Manager = com.rivercon.appprintbixolon.PrinterControl.BixolonPrinterManager;
+        const manager = new Manager(context, listener);
+
+        try {
+          manager.startFullSequence(printerAddress, zplCommand);
+        } catch (e) {
+          if (callbacks.onPrintError) {
+            callbacks.onPrintError('Error al iniciar impresión: ' + e.message);
+          } else {
+            Dialogs.alert('Error al iniciar impresión: ' + e.message);
           }
         }
-      }));
-    } catch (e) {
-      Dialogs.alert("Error al mostrar el diálogo de dispositivos: " + e.message);
-    }
-  }).catch((err) => {
-    Dialogs.alert("Permisos denegados: " + err);
-  });
+      } catch (e) {
+        if (callbacks.onPrintError) {
+          callbacks.onPrintError('Error general en flujo de impresión: ' + e.message);
+        } else {
+          Dialogs.alert('Error general en flujo de impresión: ' + e.message);
+        }
+      }
+    })
+    .catch((err) => {
+      if (callbacks.onPrintError) {
+        callbacks.onPrintError('Permisos denegados: ' + err);
+      } else {
+        Dialogs.alert('Permisos denegados: ' + err);
+      }
+    });
 }

package/src/platform-android/com/rivercon/appprintbixolon/PrinterControl/BixolonPrinterManager.java

@@ -6,6 +6,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
+
 import com.bixolon.labelprinter.BixolonLabelPrinter;
 
 public class BixolonPrinterManager {
@@ -19,23 +20,27 @@ public class BixolonPrinterManager {
     private final PrinterStateListener mStateListener;
 
     private boolean isAutoPrintSequenceActive = false;
-    private String mBase64PdfToPrint;
+    private String mBase64PdfToPrint; // aquí en realidad estás pasando ZPL, pero mantengo el nombre
 
     @SuppressLint("HandlerLeak")
     public BixolonPrinterManager(Context context, PrinterStateListener stateListener) {
         this.mStateListener = stateListener;
+
         this.mUiHandler = new Handler(Looper.getMainLooper());
-        this.mHandler = new Handler(this::dispatchMessage);
+
+        // Handler asociado explícitamente al Looper principal para recibir los mensajes del SDK
+        this.mHandler = new Handler(Looper.getMainLooper(), this::dispatchMessage);
+
         this.mPrinterConnector = new BixolonPrinterConnector(context, mHandler);
         this.mLabelPrinterHelper = new LabelPrinterHelper(context, mPrinterConnector.getPrinter());
     }
 
-    public void startFullSequence(String address, String base64Pdf) {
+    public void startFullSequence(String address, String base64PdfOrZpl) {
         if (isAutoPrintSequenceActive) {
             Log.w(TAG, "Ya hay una secuencia de impresión en curso.");
             return;
         }
-        this.mBase64PdfToPrint = base64Pdf;
+        this.mBase64PdfToPrint = base64PdfOrZpl;
         isAutoPrintSequenceActive = true;
         mPrinterConnector.connect(address);
     }
@@ -46,40 +51,64 @@ public class BixolonPrinterManager {
     }
 
     private boolean dispatchMessage(Message msg) {
+        // Mantienes tu logging de estados
         mPrinterConnector.handleConnectionMessages(msg);
 
         if (msg.what == BixolonLabelPrinter.MESSAGE_STATE_CHANGE) {
             switch (msg.arg1) {
                 case BixolonLabelPrinter.STATE_CONNECTING:
-                    mStateListener.onConnectionStateChanged("Estado: Conectando...");
+                    postToUi(() -> mStateListener.onConnectionStateChanged("Conectando..."));
                     break;
+
                 case BixolonLabelPrinter.STATE_CONNECTED:
                     String deviceName = msg.getData().getString(BixolonLabelPrinter.DEVICE_NAME, "desconocido");
-                    mStateListener.onConnectionStateChanged("Estado: Conectado a " + deviceName);
+                    postToUi(() -> mStateListener.onConnectionStateChanged("Conectado a " + deviceName));
                     if (isAutoPrintSequenceActive) {
                         executePrintSequence();
                     }
                     break;
+
                 case BixolonLabelPrinter.STATE_NONE:
-                    mStateListener.onConnectionStateChanged("Estado: Desconectado");
+                    // Puede ser desconexión normal o fallo de conexión
+                    postToUi(() -> mStateListener.onConnectionStateChanged("Desconectado"));
+                    if (isAutoPrintSequenceActive) {
+                        // Interpretamos como fallo de conexión si nunca llegó a CONNECTED
+                        postToUi(() -> mStateListener.onConnectionFailed("No se pudo mantener la conexión con la impresora."));
+                    }
                     isAutoPrintSequenceActive = false;
                     break;
             }
         }
+
+        // Manejo básico de pérdida de conexión explícita, si el SDK envía este mensaje
+        if (msg.what == BixolonLabelPrinter.MESSAGE_CONNECTION_LOST) {
+            Log.w(TAG, "Conexión con la impresora perdida.");
+            postToUi(mStateListener::onConnectionLost);
+            isAutoPrintSequenceActive = false;
+        }
+
+        // Aquí podrías manejar otros mensajes (TOAST, ERROR, STATUS) y mapearlos a onPrintError/onConnectionFailed según necesites
+
         return true;
     }
 
     private void executePrintSequence() {
         new Thread(() -> {
-            mUiHandler.post(mStateListener::showPrintingDialog);
+            postToUi(mStateListener::showPrintingDialog);
             try {
                 mLabelPrinterHelper.printLabelSample2(mBase64PdfToPrint);
+                postToUi(mStateListener::onPrintSuccess);
             } catch (Exception e) {
-                // mUiHandler.post(() -> mStateListener.onPrintError("Error: " + e.getMessage()));
+                Log.e(TAG, "Error durante la impresión", e);
+                postToUi(() -> mStateListener.onPrintError("Error: " + e.getMessage()));
             } finally {
-                mUiHandler.post(mStateListener::hidePrintingDialog);
+                postToUi(mStateListener::hidePrintingDialog);
                 disconnect();
             }
         }).start();
     }
+
+    private void postToUi(Runnable runnable) {
+        mUiHandler.post(runnable);
+    }
 }

package/src/platform-android/com/rivercon/appprintbixolon/PrinterControl/PrinterStateListener.java

@@ -12,7 +12,7 @@ public interface PrinterStateListener {
     void onConnectionStateChanged(String status);
 
     /**
-     * Pide a la UI que muestre un diálogo de impresión.
+     * Pide a la UI que muestre un diálogo de impresión (o indicador de carga).
      */
     void showPrintingDialog();
 
@@ -26,4 +26,20 @@ public interface PrinterStateListener {
      * @param errorMessage Mensaje del error.
      */
     void onPrintError(String errorMessage);
+
+    /**
+     * Se llama cuando la conexión falla antes de establecerse.
+     * @param errorMessage Mensaje descriptivo del error.
+     */
+    void onConnectionFailed(String errorMessage);
+
+    /**
+     * Se llama cuando la conexión se pierde después de haber estado conectada.
+     */
+    void onConnectionLost();
+
+    /**
+     * Se llama cuando la impresión ha terminado exitosamente.
+     */
+    void onPrintSuccess();
 }