@servicemind.tis/tis-image-and-file-upload-and-view 1.2.24 → 1.2.25

package/fesm2022/servicemind.tis-tis-image-and-file-upload-and-view.mjs

@@ -596,22 +596,27 @@ class TisRemoteUploadService {
     // Mobile Communication
     // ===========================================================================
     /**
-     * Send message to mobile device
+     * Send message to mobile device via channel
      */
     sendToMobile(type, data) {
         if (!this.socketAdapter?.sendViaSocket) {
             console.warn(`[${TisRemoteUploadService.COMPONENT}] sendViaSocket not available`);
             return;
         }
-        this.socketAdapter.sendViaSocket({
-            action: this.channelName,
+        const message = {
+            action: 'send-to-channel',
             data: {
-                type,
-                ...data,
-                desktopDeviceId: this.deviceId,
-                timestamp: Date.now()
+                channel: this.channelName,
+                payload: {
+                    type,
+                    ...data,
+                    desktopDeviceId: this.deviceId,
+                    timestamp: Date.now()
+                }
             }
-        });
+        };
+        console.log(`[${TisRemoteUploadService.COMPONENT}] Sending to mobile:`, message);
+        this.socketAdapter.sendViaSocket(message);
     }
     /**
      * Accept mobile connection (send SUCCESS response)
@@ -643,18 +648,61 @@ class TisRemoteUploadService {
         this.sendToMobile('connectionState', { state: 'SUCCESS' });
     }
     /**
-     * Disconnect from mobile device
+     * Disconnect from mobile device - call API and clear local state
      */
-    disconnect() {
+    async disconnect() {
         console.log(`[${TisRemoteUploadService.COMPONENT}] Disconnecting from mobile...`);
-        // Notify mobile
-        this.sendToMobile('connectionState', { state: 'DISCONNECTED' });
+        const mobileDeviceId = this.mobileConnection$.value?.mobileDeviceId;
+        // Call disconnect API via socket
+        if (this.socketAdapter?.callApiViaSocket && mobileDeviceId) {
+            try {
+                const callApi = this.socketAdapter.callApiViaSocket.bind(this.socketAdapter);
+                const response = await new Promise((resolve, reject) => {
+                    const timeout = setTimeout(() => reject(new Error('Disconnect API timeout')), 10000);
+                    callApi('tis-image-mobile-uploader/disconnect-mobile-link', {
+                        desktopDeviceId: this.deviceId,
+                        mobileDeviceId: mobileDeviceId,
+                        initiatedBy: 'desktop'
+                    }).pipe(take(1)).subscribe({
+                        next: (res) => {
+                            clearTimeout(timeout);
+                            resolve(res);
+                        },
+                        error: (err) => {
+                            clearTimeout(timeout);
+                            reject(err);
+                        }
+                    });
+                });
+                console.log(`[${TisRemoteUploadService.COMPONENT}] Disconnect API response:`, response);
+            }
+            catch (error) {
+                console.warn(`[${TisRemoteUploadService.COMPONENT}] Disconnect API call failed:`, error);
+                // Continue with local cleanup anyway
+            }
+        }
+        // Notify mobile via channel (backup notification)
+        this.sendToMobile('mobile-link-disconnected', {
+            desktopDeviceId: this.deviceId,
+            initiatedBy: 'desktop'
+        });
         // Clear state
         this.mobileConnection$.next(null);
         this.connectionStatus$.next('disconnected');
         this.pairingSession$.next(null);
         this.clearMobileConnection();
     }
+    /**
+     * Handle disconnect initiated from remote (mobile) side
+     */
+    handleRemoteDisconnect(data) {
+        console.log(`[${TisRemoteUploadService.COMPONENT}] Mobile disconnected:`, data);
+        // Clear state without calling API (mobile already initiated)
+        this.mobileConnection$.next(null);
+        this.connectionStatus$.next('disconnected');
+        this.pairingSession$.next(null);
+        this.clearMobileConnection();
+    }
     // ===========================================================================
     // Channel Subscription & Message Handling
     // ===========================================================================
@@ -684,18 +732,23 @@ class TisRemoteUploadService {
      */
     handleChannelMessage(message) {
         console.log(`[${TisRemoteUploadService.COMPONENT}] Received:`, message);
-        // Extract message type and data
-        const type = message.type || message.data?.type;
-        const data = message.data || message.payload || message;
+        // Extract message type and data - handle nested payload structure
+        const payload = message.payload || message.data || message;
+        const type = payload.type || message.type;
+        const data = payload;
         switch (type) {
             case 'connectionState':
                 this.handleConnectionState(data);
                 break;
+            case 'mobile-link-established':
+                this.handleMobileLinkEstablished(data);
+                break;
             case 'image-uploaded':
             case 'upload_complete':
                 this.handleUploadComplete(message);
                 break;
             case 'disconnect':
+            case 'mobile-link-disconnected':
                 this.handleMobileDisconnect(data);
                 break;
             default:
@@ -708,6 +761,50 @@ class TisRemoteUploadService {
                 }
         }
     }
+    /**
+     * Handle mobile-link-established message
+     * This is sent when mobile successfully connects via the backend
+     */
+    handleMobileLinkEstablished(data) {
+        const mobileDeviceId = data.mobileDeviceId;
+        const mobileConnectionId = data.mobileConnectionId;
+        const userId = data.userId;
+        console.log(`[${TisRemoteUploadService.COMPONENT}] Mobile link established:`, {
+            mobileDeviceId,
+            mobileConnectionId,
+            userId
+        });
+        if (mobileDeviceId) {
+            // Save mobile connection
+            const connectionInfo = {
+                mobileDeviceId,
+                connectedAt: Date.now(),
+                lastActivity: Date.now()
+            };
+            this.mobileConnection$.next(connectionInfo);
+            this.saveMobileConnection(connectionInfo);
+            // Update status to connected
+            this.connectionStatus$.next('connected');
+            // Update session
+            const session = this.pairingSession$.value;
+            if (session) {
+                const updatedSession = {
+                    ...session,
+                    mobileDeviceId,
+                    status: 'connected',
+                    lastActivity: Date.now()
+                };
+                this.pairingSession$.next(updatedSession);
+            }
+            // Send SUCCESS acknowledgment to mobile
+            this.sendToMobile('connectionState', {
+                state: 'SUCCESS',
+                desktopDeviceId: this.deviceId,
+                mobileConnectionId
+            });
+            console.log(`[${TisRemoteUploadService.COMPONENT}] Connection established with mobile device:`, mobileDeviceId);
+        }
+    }
     /**
      * Handle connection state messages from mobile
      */
@@ -892,6 +989,10 @@ class TisQrCodeDialogComponent {
             this.isConnected = true;
             this.connectionStatus = 'connected';
             this.isLoading = false;
+            // Send field info to mobile since already connected
+            if (this.data.fieldInfo) {
+                this.sendFieldInfoToMobile();
+            }
         }
         else {
             // No existing connection, generate QR code
@@ -920,7 +1021,12 @@ class TisQrCodeDialogComponent {
             .pipe(takeUntil(this.destroy$))
             .subscribe(status => {
             this.connectionStatus = status;
+            const wasConnected = this.isConnected;
             this.isConnected = status === 'connected';
+            // Send field info when first connected
+            if (!wasConnected && this.isConnected && this.data.fieldInfo) {
+                this.sendFieldInfoToMobile();
+            }
         });
         // Mobile connection changes
         this.remoteUploadService.getMobileConnection()
@@ -944,6 +1050,15 @@ class TisQrCodeDialogComponent {
             console.error('[TisQrCodeDialog] Error:', error);
         });
     }
+    /**
+     * Send field configuration to mobile device
+     */
+    sendFieldInfoToMobile() {
+        if (!this.data.fieldInfo)
+            return;
+        console.log('[TisQrCodeDialog] Sending field info to mobile:', this.data.fieldInfo);
+        this.remoteUploadService.sendToMobile('field-info', this.data.fieldInfo);
+    }
     startCountdown() {
         if (this.countdownSubscription) {
             this.countdownSubscription.unsubscribe();
@@ -2615,7 +2730,17 @@ class TisImageAndFileUploadAndViewComponent {
             subtitle: `Scan this QR code to upload ${this.type === 'image' ? 'images' : 'files'} from your mobile device`,
             qrSize: 200,
             showCountdown: true,
-            autoCloseOnUpload: false
+            autoCloseOnUpload: false,
+            fieldInfo: {
+                label: this.label || `${this.type === 'image' ? 'Images' : 'Files'}`,
+                accept: this.accept || (this.type === 'image' ? 'image/*' : '*'),
+                type: this.type,
+                entityType: this.entityType,
+                entityId: this.entityId,
+                isMultiple: this.config.isMultiple,
+                limit: this.config.limit,
+                isCompressed: this.config.isCompressed
+            }
         };
         const dialogRef = this.dialog.open(TisQrCodeDialogComponent, {
             width: this.isMobile ? '100%' : '420px',