@rws-framework/client 2.24.0 → 2.26.0

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.24.0",
+    "version": "2.26.0",
     "main": "src/index.ts",
     "scripts": {
         "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -41,7 +41,6 @@
         "reflect-metadata": "^0.2.2",
         "resolve-url-loader": "^5.0.0",
         "socket.io-client": "^4.7.2",
-        "upload": "^1.3.2",
         "url-router": "^13.0.0",
         "uuid": "^9.0.1",
         "v4": "^0.0.1",

package/src/index.ts

@@ -25,7 +25,7 @@ import type IRWSUser from './types/IRWSUser';
 import type { IAssetShowOptions, IRWSViewComponent } from './components/_component';
 import type { RWSDecoratorOptions } from './components/_decorator';
 import type { DOMOutputType, TagsProcessorType } from './services/DOMService';
-import type { IBackendRoute, IHTTProute, IPrefixedHTTProutes } from './services/ApiService';
+import type { IBackendRoute, IHTTProute, IPrefixedHTTProutes, UploadFunctionOptions } from './services/ApiService';
 import type IRWSConfig from './types/IRWSConfig';
 import type RWSNotify from './types/RWSNotify';
 import type { NotifyUiType, NotifyLogType }  from './types/RWSNotify';
@@ -87,5 +87,6 @@ export type {
     IRWSConfig,
     IRWSUser,
     TagsProcessorType,
-    IRWSViewComponent
+    IRWSViewComponent,
+    UploadFunctionOptions as IRWSUploadFunctionOptions
 }

package/src/services/ApiService.ts

@@ -1,11 +1,10 @@
 import { ITypesResponse } from '../../../components/src/types/IBackendCore';
 import TheService from './_service';
+import axios from 'axios';
 
 //@4DI
 import ConfigService, { ConfigServiceInstance } from './ConfigService';
 
-import { upload, UploadResponse } from 'upload';
-
 import { backend } from './_api/backend';
 import { calls } from './_api/calls';
 
@@ -44,12 +43,29 @@ interface IPrefixedHTTProutes<P = {[key: string]: any}> {
 
 type IBackendRoute = IHTTProute | IPrefixedHTTProutes;
 
+interface UploadFunctionOptions {
+    headers?: Record<string, string>;
+    method?: 'POST' | 'PUT' | 'PATCH';
+    onProgress?: (progress: number) => void;
+}
+
+interface UploadResponse {
+    success: boolean;
+    data?: any;
+    error?: string;
+}
 
 
 class ApiService extends TheService {
     static _DEFAULT: boolean = true;
     public token?: string;    
 
+    private defaultUploadOptions: () => UploadFunctionOptions = () => ({
+        headers: this.token ? { Authorization: `Bearer ${this.token}` } : {},
+        method: 'POST' as const,
+        onProgress: (progress: number) => null,
+    });
+
     constructor(@ConfigService public config: ConfigServiceInstance) {
         super();        
     }
@@ -69,20 +85,58 @@ class ApiService extends TheService {
         }
     }    
 
-    async uploadFile(url: string, file: File, onProgress: (progress: number) => void, payload: any = {}): Promise<UploadResponse>
-    {
-        return upload(
-            
-            url,
-            {
-                file,
-                ...payload
-            },
-            {
-                onProgress,
-                headers: this.token ? { Authorization: `Bearer ${this.token}` } : null,
+    async uploadFile(url: string, files: Record<string, File>, payload: any = {}, uploadOptions: UploadFunctionOptions = this.defaultUploadOptions()): Promise<UploadResponse>
+    {        
+        const formData = new FormData();
+        
+        // Add files to FormData
+        Object.entries(files).forEach(([key, file]) => {
+            formData.append(key, file);
+        });
+        
+        // Add payload data to FormData
+        Object.entries(payload).forEach(([key, value]) => {
+            if (value !== undefined && value !== null) {
+                formData.append(key, typeof value === 'object' ? JSON.stringify(value) : String(value));
             }
-        );
+        });
+        
+        const options = {
+            ...this.defaultUploadOptions(),
+            ...uploadOptions
+        };
+        
+        try {
+            const method = options.method || 'POST';
+            
+            const axiosConfig = {
+                method: method.toLowerCase() as any,
+                url,
+                data: formData,
+                headers: {
+                    'Content-Type': 'multipart/form-data',
+                    ...options.headers
+                },
+                onUploadProgress: (progressEvent: any) => {
+                    if (options.onProgress && progressEvent.total) {
+                        const progress = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+                        options.onProgress(progress);
+                    }
+                }
+            };
+            
+            const result = await axios(axiosConfig);
+            
+            return {
+                success: true,
+                data: result.data
+            };
+        } catch (error: any) {
+            return {
+                success: false,
+                error: error.response?.data?.message || error.message || 'Upload failed'
+            };
+        }
     }
 
     public pureGet = calls.pureGet;
@@ -96,7 +150,7 @@ class ApiService extends TheService {
         post: async <T, P extends object = object>(routeName: string, payload?: P, options?: IAPIOptions): Promise<T> => calls.post.bind(this)(backend.getBackendUrl.bind(this)(routeName, options?.routeParams, options?.queryParams), payload, options) as Promise<T>,
         put: async <T, P extends object = object>(routeName: string, payload: P, options?: IAPIOptions): Promise<T> => calls.put.bind(this)(backend.getBackendUrl.bind(this)(routeName, options?.routeParams, options?.queryParams), payload, options) as Promise<T>,
         delete: async <T>(routeName: string, options?: IAPIOptions): Promise<T> => calls.delete.bind(this)(backend.getBackendUrl.bind(this)(routeName, options?.routeParams, options?.queryParams), options) as Promise<T>,
-        uploadFile: async (routeName: string, file: File, onProgress: (progress: number) => void, options: IAPIOptions = {}, payload: any = {}): Promise<UploadResponse> => this.uploadFile(backend.getBackendUrl.bind(this)(routeName, options?.routeParams), file, onProgress, payload),
+        uploadFile: async (routeName: string, files: Record<string, File>, payload: any = {}, uploadOptions: UploadFunctionOptions = this.defaultUploadOptions(), options: IAPIOptions = {}): Promise<UploadResponse> => this.uploadFile(backend.getBackendUrl.bind(this)(routeName, options?.routeParams), files, payload, uploadOptions),
     };
 
     async getResource(resourceName: string): Promise<ITypesResponse>
@@ -108,4 +162,4 @@ class ApiService extends TheService {
 }
 
 export default ApiService.getSingleton();
-export { IBackendRoute, RequestOptions, ApiService as ApiServiceInstance, IHTTProute, IPrefixedHTTProutes, IAPIOptions };
+export { IBackendRoute, RequestOptions, ApiService as ApiServiceInstance, IHTTProute, IPrefixedHTTProutes, IAPIOptions, UploadFunctionOptions };

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "compilerOptions": {        
+  "compilerOptions": {
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "target": "ES2018",
@@ -7,7 +7,7 @@
     "moduleResolution": "node",
     "strict": true,
     "esModuleInterop": true,
-    "sourceMap": true,    
+    "sourceMap": true,
     "strictNullChecks": false,
     "allowSyntheticDefaultImports": true,
     "lib": [