@tagsamurai/fats-api-services 1.0.0-alpha.301 → 1.0.0-alpha.303

package/api-services.es.js

@@ -42,19 +42,50 @@ const queryParamsStringfy = (data) => {
   });
   return assignedData;
 };
-const getImageURL = (name, width, height) => {
-  if (!name) return;
-  const BASE_URL = getBaseURL("APP_API");
-  const filePath = name.startsWith("http") ? name : `${BASE_URL}/utility/v2/files/${name.replace(/^\/+/, "")}`;
+const buildImageUrl = (name, width, height) => {
+  const BASE_URL = new URL(getBaseURL("APP_API")).origin;
+  let url = name.startsWith("http") ? name : `${BASE_URL}/file-storage/api/file/${name.replace(/^\/+/, "")}`;
   if (width || height) {
     const params = new URLSearchParams();
     if (width) {
       params.set("width", width.toString());
-      params.set("height", height ? height == null ? void 0 : height.toString() : width.toString());
+      params.set("height", (height == null ? void 0 : height.toString()) || width.toString());
+    }
+    url += `?${params.toString()}`;
+  }
+  return url;
+};
+const getAuthToken = () => {
+  const user = JSON.parse(localStorage.getItem("user") ?? "{}");
+  return user.jwt ?? user.token ?? "";
+};
+const fetchImageBlob = async (url, token) => {
+  const res = await fetch(url, {
+    headers: {
+      Authorization: `Bearer ${token}`
     }
-    return `${filePath}?${params.toString()}`;
+  });
+  if (!res.ok) {
+    throw new Error(`Image fetch failed: ${res.status} ${res.statusText}`);
+  }
+  return res.blob();
+};
+const blobToDataURI = (blob) => new Promise((resolve, reject) => {
+  const reader = new FileReader();
+  reader.onloadend = () => resolve(reader.result);
+  reader.onerror = reject;
+  reader.readAsDataURL(blob);
+});
+const getImageURL = async (name, width, height) => {
+  if (!name) return;
+  try {
+    const url = buildImageUrl(name, width, height);
+    const token = getAuthToken();
+    const blob = await fetchImageBlob(url, token);
+    return blobToDataURI(blob);
+  } catch (err) {
+    return void 0;
   }
-  return filePath;
 };
 const getAssetsFile = async (file, type = "excel") => {
   const response = await fetch(
@@ -1875,6 +1906,9 @@ const ReaderServices = {
   getIOTReaderListOptions: (params) => {
     return API$b.get("/options", { params });
   },
+  setIOTAliasName: (body) => {
+    return API$b.put("/set-alias-name", body);
+  },
   getActivityLogData: (params) => {
     return API$b.get("/activity-log", { params });
   },

package/api-services.system.js

@@ -49,19 +49,50 @@ System.register(["axios"], function(exports, module) {
         });
         return assignedData;
       });
-      const getImageURL = exports("getImageURL", (name, width, height) => {
-        if (!name) return;
-        const BASE_URL = getBaseURL("APP_API");
-        const filePath = name.startsWith("http") ? name : `${BASE_URL}/utility/v2/files/${name.replace(/^\/+/, "")}`;
+      const buildImageUrl = (name, width, height) => {
+        const BASE_URL = new URL(getBaseURL("APP_API")).origin;
+        let url = name.startsWith("http") ? name : `${BASE_URL}/file-storage/api/file/${name.replace(/^\/+/, "")}`;
         if (width || height) {
           const params = new URLSearchParams();
           if (width) {
             params.set("width", width.toString());
-            params.set("height", height ? height == null ? void 0 : height.toString() : width.toString());
+            params.set("height", (height == null ? void 0 : height.toString()) || width.toString());
+          }
+          url += `?${params.toString()}`;
+        }
+        return url;
+      };
+      const getAuthToken = () => {
+        const user = JSON.parse(localStorage.getItem("user") ?? "{}");
+        return user.jwt ?? user.token ?? "";
+      };
+      const fetchImageBlob = async (url, token) => {
+        const res = await fetch(url, {
+          headers: {
+            Authorization: `Bearer ${token}`
           }
-          return `${filePath}?${params.toString()}`;
+        });
+        if (!res.ok) {
+          throw new Error(`Image fetch failed: ${res.status} ${res.statusText}`);
+        }
+        return res.blob();
+      };
+      const blobToDataURI = (blob) => new Promise((resolve, reject) => {
+        const reader = new FileReader();
+        reader.onloadend = () => resolve(reader.result);
+        reader.onerror = reject;
+        reader.readAsDataURL(blob);
+      });
+      const getImageURL = exports("getImageURL", async (name, width, height) => {
+        if (!name) return;
+        try {
+          const url = buildImageUrl(name, width, height);
+          const token = getAuthToken();
+          const blob = await fetchImageBlob(url, token);
+          return blobToDataURI(blob);
+        } catch (err) {
+          return void 0;
         }
-        return filePath;
       });
       const getAssetsFile = exports("getAssetsFile", async (file, type = "excel") => {
         const response = await fetch(
@@ -1882,6 +1913,9 @@ System.register(["axios"], function(exports, module) {
         getIOTReaderListOptions: (params) => {
           return API$b.get("/options", { params });
         },
+        setIOTAliasName: (body) => {
+          return API$b.put("/set-alias-name", body);
+        },
         getActivityLogData: (params) => {
           return API$b.get("/activity-log", { params });
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tagsamurai/fats-api-services",
-  "version": "1.0.0-alpha.301",
+  "version": "1.0.0-alpha.303",
   "author": "developer.tagsamurai",
   "description": "Fixed Asset Tag Samurai Services Library",
   "module": "./api-services.es.js",

package/src/dto/reader.dto.d.ts

@@ -21,3 +21,7 @@ export interface GetIOTReaderListOptionsQueryParams {
     managerOptions?: boolean;
     antennaGroupOptions?: boolean;
 }
+export interface SetIOTAliasNameBody {
+    aliasName: string;
+    id: string[];
+}

package/src/services/oldReader.service.d.ts

@@ -1,10 +1,11 @@
 import { AxiosResponse } from 'axios';
 import { ActivityLogOptionParams, ChangeLogOptionParams, ChangeLogParams, IOTReaderList, IOTReaderListOptions, QueryParams } from '../types/reader.type';
-import { FetchDetailResponse, FetchListResponse } from '../types/fetchResponse.type';
-import { GetIOTReaderListOptionsQueryParams, GetIOTReaderListQueryParams } from '../dto/reader.dto';
+import { FetchDetailResponse, FetchListResponse, FetchResponse } from '../types/fetchResponse.type';
+import { GetIOTReaderListOptionsQueryParams, GetIOTReaderListQueryParams, SetIOTAliasNameBody } from '../dto/reader.dto';
 declare const ReaderServices: {
     getIOTReaderList: (params: GetIOTReaderListQueryParams) => Promise<AxiosResponse<FetchListResponse<IOTReaderList>>>;
     getIOTReaderListOptions: (params: GetIOTReaderListOptionsQueryParams) => Promise<AxiosResponse<FetchDetailResponse<IOTReaderListOptions>>>;
+    setIOTAliasName: (body: SetIOTAliasNameBody) => Promise<AxiosResponse<FetchResponse>>;
     getActivityLogData: (params: QueryParams) => Promise<AxiosResponse>;
     getActivityLogOptions: (params: ActivityLogOptionParams) => Promise<AxiosResponse>;
     getDataById: (id: string) => Promise<AxiosResponse>;

package/src/utils/getImageURL.util.d.ts

@@ -1 +1 @@
-export declare const getImageURL: (name?: string | null, width?: number, height?: number) => string | undefined;
+export declare const getImageURL: (name?: string | null, width?: number, height?: number) => Promise<string | undefined>;