soyba-lib 1.0.9 → 1.0.10

package/package.json

@@ -1,14 +1,18 @@
 {
   "name": "soyba-lib",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "main": "src/index.js",
   "type": "module",
   "description": "Thư viện YBA (Sổ Y Bạ) - Truy vấn lịch sử khám bệnh",
-  "keywords": ["yba", "soyba", "medical", "history"],
+  "keywords": [
+    "yba",
+    "soyba",
+    "medical",
+    "history"
+  ],
   "author": "hospital-backend",
   "license": "MIT",
   "dependencies": {
-    "axios": "^1.6.0",
-    "xml2js": "^0.6.2"
+    "axios": "^1.6.0"
   }
 }

package/src/index.js

@@ -1,235 +1,117 @@
 // lib/soyba/src/index.js
 import axios from 'axios';
-import { parseStringPromise } from 'xml2js';
 
 class YBAClient {
   constructor(options = {}) {
     this.baseUrl = options.baseUrl || process.env.API_SOYBA;
-    this.baseUrlKq = options.baseUrlKq || process.env.API_SOYBA_KQ;
     this.apiKey = options.apiKey || process.env.API_KEY;
-    this.timeout = options.timeout || 30000;
+    this.timeout = options.timeout || 3000;
     this.logger = options.logger || console;
-    
+
     if (!this.baseUrl) {
       throw new Error('YBA baseUrl is required');
     }
-    
-    // Log configuration for debugging
     this.logger.debug('YBAClient initialized', {
       baseUrl: this.baseUrl,
-      baseUrlKq: this.baseUrlKq,
       hasApiKey: !!this.apiKey,
       timeout: this.timeout
     });
   }
 
-  _buildAuthorizationHeader(token) {
-    const apiKey = this.apiKey || '';
-    if (token) return `${token}${apiKey}`;
-    return apiKey ? `token ${apiKey}` : undefined;
-  }
 
-  _isBase64(str) {
-    if (typeof str !== 'string' || str.length === 0) return false;
-    
-    // Remove whitespace and check format
-    const cleaned = str.replace(/\s+/g, '');
-    if (!/^[A-Za-z0-9+/=_-]+$/.test(cleaned)) return false;
-    
-    // Check if it's a valid base64
-    try {
-      const decoded = Buffer.from(cleaned, 'base64').toString('utf8');
-      // Check if it looks like XML
-      return decoded.includes('<') && decoded.includes('>');
-    } catch {
-      return false;
+  _getHeaders() {
+    const headers = {
+      'Content-Type': 'application/json',
+      'accept': '*/*',
+    };
+    if (this.apiKey) {
+      headers['Authorization'] = this.apiKey;
     }
+    return headers;
   }
 
-  async _decodeBase64ToXml(base64Str) {
+  async getLichSuKham({ cccd, ma_lk = '' }) {
+    const url = this.baseUrl;
+    const headers = this._getHeaders();
     try {
-      const cleaned = base64Str.replace(/\s+/g, '');
-      const xmlStr = Buffer.from(cleaned, 'base64').toString('utf8');
-      
-      // Parse XML to JSON
-      const json = await parseStringPromise(xmlStr, { 
-        explicitArray: false, 
-        mergeAttrs: true,
-        trim: true 
+      const response = await axios.get(url, {
+        headers,
+        params: { CCCD: cccd, MA_LK: ma_lk },
+        timeout: this.timeout,
       });
-      
-      return { xml: xmlStr, json };
+      return { status: response.status, data: response.data };
     } catch (error) {
-      this.logger.warn('Failed to decode base64 XML', { error: error.message });
-      return { xml: null, json: null };
+      const status = error.response?.status || 500;
+      const data = error.response?.data || { error: 'SOYBA request failed' };
+      return { status, data };
     }
   }
 
-  async _fetchAndParseXmlFromUrl(url) {
+  async getChiTietThuoc({ cccd = '', ma_lk }) {
+    const url = `${this.baseUrl}/chi_tiet_thuoc`;
+    const headers = this._getHeaders();
     try {
-      this.logger.debug('Fetching XML from URL', { url });
-      
       const response = await axios.get(url, {
+        headers,
+        params: { CCCD: cccd, MA_LK: ma_lk },
         timeout: this.timeout,
-        responseType: 'text'
       });
-      
-      // Parse XML to JSON
-      const json = await parseStringPromise(response.data, { 
-        explicitArray: false, 
-        mergeAttrs: true,
-        trim: true 
-      });
-      
-      return { xml: response.data, json };
+      return { status: response.status, data: response.data };
     } catch (error) {
-      this.logger.warn('Failed to fetch/parse XML from URL', { url, error: error.message });
-      return { xml: null, json: null };
+      const status = error.response?.status || 500;
+      const data = error.response?.data || { error: 'SOYBA request failed' };
+      return { status, data };
     }
   }
 
-  async _processNestedXmlFiles(obj) {
-    if (!obj || typeof obj !== 'object') return obj;
-
-    // Process arrays
-    if (Array.isArray(obj)) {
-      const processed = [];
-      for (const item of obj) {
-        processed.push(await this._processNestedXmlFiles(item));
-      }
-      return processed;
-    }
-
-    // Process objects
-    const result = {};
-    for (const [key, value] of Object.entries(obj)) {
-      if (key === 'FILEHOSO' && Array.isArray(value)) {
-        // Process FILEHOSO array - decode NOIDUNGFILE in each item
-        const processedFiles = [];
-        for (const file of value) {
-          if (file && file.NOIDUNGFILE && this._isBase64(file.NOIDUNGFILE)) {
-            this.logger.debug('Decoding XML file', { LOAIHOSO: file.LOAIHOSO });
-            const decoded = await this._decodeBase64ToXml(file.NOIDUNGFILE);
-            processedFiles.push({
-              ...file,
-              NOIDUNGFILE: decoded.json || decoded.xml || file.NOIDUNGFILE
-            });
-          } else {
-            processedFiles.push(file);
-          }
-        }
-        result[key] = processedFiles;
-      } else if (typeof value === 'object') {
-        result[key] = await this._processNestedXmlFiles(value);
-      } else {
-        result[key] = value;
-      }
+  async getChiTietDvkt({ cccd = '', ma_lk }) {
+    const url = `${this.baseUrl}/chi_tiet_dvkt`;
+    const headers = this._getHeaders();
+    try {
+      const response = await axios.get(url, {
+        headers,
+        params: { CCCD: cccd, MA_LK: ma_lk },
+        timeout: this.timeout,
+      });
+      return { status: response.status, data: response.data };
+    } catch (error) {
+      const status = error.response?.status || 500;
+      const data = error.response?.data || { error: 'SOYBA request failed' };
+      return { status, data };
     }
-    return result;
   }
 
-  async getLichSuKham(cccd, token) {
-    const correlationId = `soyba_hist_${Date.now()}_${Math.random().toString(36).slice(2,9)}`;
-    
-    if (!this.baseUrl) {
-      this.logger.error('SOYBA base url not configured', { correlationId });
-      throw new Error('Missing API_SOYBA in environment');
-    }
-
-    const url = `${this.baseUrl}`;
-    const headers = { 'Content-Type': 'application/json' };
-    const auth = this._buildAuthorizationHeader(token);
-    if (auth) headers.Authorization = auth;
-
+  async getChiTietCls({ cccd = '', ma_lk }) {
+    const url = `${this.baseUrl}/chi_tiet_cls`;
+    const headers = this._getHeaders();
     try {
-      this.logger.debug('SOYBA getLichSuKham request', { correlationId, url, params: { cccd } });
-      const response = await axios.get(url, { headers, params: { cccd }, timeout: this.timeout });
-      this.logger.debug('SOYBA getLichSuKham response', { correlationId, status: response.status });
-      
+      const response = await axios.get(url, {
+        headers,
+        params: { CCCD: cccd, MA_LK: ma_lk },
+        timeout: this.timeout,
+      });
       return { status: response.status, data: response.data };
     } catch (error) {
-      this.logger.error('SOYBA getLichSuKham failed', { 
-        correlationId, 
-        error: error.message, 
-        status: error.response?.status 
-      });
-      
       const status = error.response?.status || 500;
       const data = error.response?.data || { error: 'SOYBA request failed' };
       return { status, data };
     }
   }
 
-  async getChiTietLichSu(cccd, ma_lk, token) {
-    const correlationId = `soyba_detail_${Date.now()}_${Math.random().toString(36).slice(2,9)}`;
-    
-    // Use baseUrlKq for detail requests if different from baseUrl
-    const baseUrlToUse = this.baseUrlKq;
-    
-    if (!baseUrlToUse) {
-      this.logger.error('SOYBAKQ base url not configured', { correlationId });
-      throw new Error('Missing API_SOYBA_KQ in environment');
-    }
-
-    // If baseUrlKq is different, use it directly, otherwise append path
-    const url = baseUrlToUse
-    const headers = { 'Content-Type': 'application/json' };
-    const auth = this._buildAuthorizationHeader(token);
-    if (auth) headers.Authorization = auth;
-
+  async getPhieuKham({ cccd = '', ma_lk }) {
+    const url = `${this.baseUrl}/phieukham`;
+    const headers = this._getHeaders();
     try {
-      this.logger.debug('SOYBA getChiTietLichSu request', { correlationId, url, params: { cccd, ma_lk } });
-      const response = await axios.get(url, { headers, params: { cccd, ma_lk }, timeout: this.timeout });
-      
-      this.logger.debug('YBA raw response received', { correlationId, dataLength: JSON.stringify(response.data).length });
-      
-      let processedData = response.data;
-      
-      // Handle different response formats
-      if (Array.isArray(processedData)) {
-        // Process each item in array
-        const processedArray = [];
-        for (const item of processedData) {
-          if (item.Url && item.ContentType === 'text/xml') {
-            // New format: fetch XML from URL
-            this.logger.debug('Fetching XML from URL', { Url: item.Url });
-            const xmlResult = await this._fetchAndParseXmlFromUrl(item.Url);
-            if (xmlResult.json) {
-              // Process nested XML files in the fetched content
-              const processedXml = await this._processNestedXmlFiles(xmlResult.json);
-              processedArray.push({
-                ...item,
-                NOIDUNGFILE: processedXml
-              });
-            } else {
-              processedArray.push(item);
-            }
-          } else {
-            // Process existing NOIDUNGFILE if present
-            const processedItem = await this._processNestedXmlFiles(item);
-            processedArray.push(processedItem);
-          }
-        }
-        processedData = processedArray;
-      } else if (processedData && typeof processedData === 'object') {
-        // Single object - process nested files
-        processedData = await this._processNestedXmlFiles(processedData);
-      }
-      
-      this.logger.debug('YBA processing completed', { correlationId });
-      return { status: response.status, data: processedData };
-      
-    } catch (error) {
-      this.logger.error('SOYBA getChiTietLichSu failed', { 
-        correlationId, 
-        error: error.message,
-        status: error.response?.status,
-        url, 
-        params: { cccd, ma_lk } 
+      const response = await axios.get(url, {
+        headers,
+        params: { CCCD: cccd, MA_LK: ma_lk },
+        timeout: this.timeout,
       });
-      
+      return { status: response.status, data: response.data };
+    } catch (error) {
       const status = error.response?.status || 500;
-      return { status, data: [] };
+      const data = error.response?.data || { error: 'SOYBA request failed' };
+      return { status, data };
     }
   }
 }