@fatehan/tsrp 1.1.14 → 1.1.15

package/dist/report.js

@@ -7,179 +7,93 @@ exports.ReportService = void 0;
 const report_1 = require("./fatehan/reports/report");
 const system_io_1 = require("./store/system.io");
 const system_io_2 = __importDefault(require("./system.io"));
+/**
+ * A service for fetching reports from the com.fatehan.reports.ReportService backend.
+ * Implements a dynamic header provider to act as an interceptor for authentication.
+ */
 class ReportService {
-    constructor(url, authorization, organizationId) {
+    /**
+     * @param url The base URL of the API server.
+     * @param headerProvider A function that returns headers to be added to each request.
+     */
+    constructor(url, headerProvider) {
         this.namespace = "com.fatehan.reports.ReportService";
         this.url = url;
-        this.headers = {
+        this.getDynamicHeaders = headerProvider;
+    }
+    async _call(methodName, request, encoder, decoder) {
+        const dynamicHeaders = await this.getDynamicHeaders();
+        const headers = {
             "Content-Type": "application/octet-stream",
             Accept: "application/octet-stream",
+            ...dynamicHeaders,
         };
-        if (authorization) {
-            this.headers["authorization"] = "Bearer " + authorization;
+        const response = await fetch(`${this.url}/${this.namespace}/${methodName}`, {
+            method: "POST",
+            headers: headers,
+            body: new Uint8Array(encoder.encode(request).finish()),
+        });
+        if (response.ok) {
+            const buffer = await response.arrayBuffer();
+            return decoder.decode(new Uint8Array(buffer));
         }
-        if (organizationId) {
-            this.headers["organization-id"] = organizationId;
+        else {
+            const errorText = await response.text();
+            throw new Error(`API Error (${response.status}): ${errorText}`);
         }
     }
+    // --- Public Unary API Methods ---
     RouteStopReport(request) {
-        return new Promise(async (resolve, reject) => {
-            const response = await fetch(`${this.url}/${this.namespace}/RouteStopReport`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.RouteStopRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                resolve(report_1.RouteStopResponse.decode(new Uint8Array(await response.arrayBuffer())));
-            }
-            else {
-                reject(await response.text());
-            }
-        });
+        return this._call("RouteStopReport", request, report_1.RouteStopRequest, report_1.RouteStopResponse);
     }
     TripPerformanceReport(request) {
-        return new Promise(async (resolve, reject) => {
-            const response = await fetch(`${this.url}/${this.namespace}/TripPerformanceReport`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.TripPerformanceRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                resolve(report_1.TripPerformanceResponse.decode(new Uint8Array(await response.arrayBuffer())));
-            }
-            else {
-                reject(await response.text());
-            }
-        });
+        return this._call("TripPerformanceReport", request, report_1.TripPerformanceRequest, report_1.TripPerformanceResponse);
     }
     TripReport(request) {
-        return new Promise(async (resolve, reject) => {
-            const response = await fetch(`${this.url}/${this.namespace}/TripReport`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.TripReportRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                resolve(report_1.TripReportResponse.decode(new Uint8Array(await response.arrayBuffer())));
-            }
-            else {
-                reject(await response.text());
-            }
-        });
+        return this._call("TripReport", request, report_1.TripReportRequest, report_1.TripReportResponse);
     }
     RouteReviewReport(request) {
-        return new Promise(async (resolve, reject) => {
-            const response = await fetch(`${this.url}/${this.namespace}/RouteReviewReport`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.RouteReviewRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                resolve(report_1.RouteReviewResponse.decode(new Uint8Array(await response.arrayBuffer())));
-            }
-            else {
-                reject(await response.text());
-            }
-        });
+        return this._call("RouteReviewReport", request, report_1.RouteReviewRequest, report_1.RouteReviewResponse);
     }
     DashboardIndividual(request) {
-        return new Promise(async (resolve, reject) => {
-            const response = await fetch(`${this.url}/${this.namespace}/DashboardIndividual`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.DashboardIndividualRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                resolve(report_1.DashboardIndividualResponse.decode(new Uint8Array(await response.arrayBuffer())));
-            }
-            else {
-                reject(await response.text());
-            }
-        });
+        return this._call("DashboardIndividual", request, report_1.DashboardIndividualRequest, report_1.DashboardIndividualResponse);
     }
     LogReport(request) {
-        return new Promise(async (resolve, reject) => {
-            const response = await fetch(`${this.url}/${this.namespace}/LogReport`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.LogRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                resolve(report_1.LogResponse.decode(new Uint8Array(await response.arrayBuffer())));
-            }
-            else {
-                reject(await response.text());
-            }
-        });
+        return this._call("LogReport", request, report_1.LogRequest, report_1.LogResponse);
     }
     DataReport(request) {
-        return new Promise(async (resolve, reject) => {
-            const response = await fetch(`${this.url}/${this.namespace}/DeviceDataReport`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.DeviceDataRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                resolve(report_1.DeviceDataResponse.decode(new Uint8Array(await response.arrayBuffer())));
-            }
-            else {
-                reject(await response.text());
-            }
-        });
+        return this._call("DeviceDataReport", request, report_1.DeviceDataRequest, report_1.DeviceDataResponse);
     }
     AreaSummaryReviewReport(request) {
-        return new Promise(async (resolve, reject) => {
-            const response = await fetch(`${this.url}/${this.namespace}/AreaSummaryReviewReport`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.AreaSummaryReviewRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                resolve(report_1.AreaSummaryReviewResponse.decode(new Uint8Array(await response.arrayBuffer())));
-            }
-            else {
-                reject(await response.text());
-            }
-        });
+        return this._call("AreaSummaryReviewReport", request, report_1.AreaSummaryReviewRequest, report_1.AreaSummaryReviewResponse);
     }
     WorkCycleReport(request) {
-        return new Promise(async (resolve, reject) => {
-            const response = await fetch(`${this.url}/${this.namespace}/WorkCycleReport`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.WorkCycleRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                resolve(report_1.WorkCycleResponse.decode(new Uint8Array(await response.arrayBuffer())));
-            }
-            else {
-                reject(await response.text());
-            }
-        });
+        return this._call("WorkCycleReport", request, report_1.WorkCycleRequest, report_1.WorkCycleResponse);
     }
     CommandHistoryReport(request) {
-        return new Promise(async (resolve, reject) => {
-            const response = await fetch(`${this.url}/${this.namespace}/CommandHistoryReport`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.CommandHistoryRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                resolve(report_1.CommandHistoryResponse.decode(new Uint8Array(await response.arrayBuffer())));
-            }
-            else {
-                reject(await response.text());
-            }
-        });
+        return this._call("CommandHistoryReport", request, report_1.CommandHistoryRequest, report_1.CommandHistoryResponse);
     }
+    WorkflowReport(request) {
+        return this._call("WorkflowReport", request, report_1.WorkflowRequest, report_1.WorkflowResponse);
+    }
+    // --- Special Case Methods ---
+    /**
+     * Handles a streaming RPC for chart data.
+     */
     async ChartReport(request, responses) {
+        const dynamicHeaders = await this.getDynamicHeaders();
+        const headers = {
+            "Content-Type": "application/octet-stream",
+            Accept: "application/octet-stream",
+            ...dynamicHeaders,
+        };
         const res = await fetch(`${this.url}/${this.namespace}/ChartReport`, {
             method: "POST",
-            headers: this.headers,
+            headers: headers,
             body: new Uint8Array(report_1.ChartRequest.encode(request).finish()),
         });
         if (res.body == null) {
-            console.error("request body is empty");
+            console.error("ChartReport response body is null.");
             return;
         }
         const reader = res.body.getReader();
@@ -196,65 +110,43 @@ class ReportService {
                 const msgLen = new DataView(buffer.buffer).getUint32(0);
                 if (buffer.length < 4 + msgLen)
                     break;
-                responses(report_1.ChartResponse.decode(buffer.slice(4, 4 + msgLen)));
+                const message = buffer.slice(4, 4 + msgLen);
+                responses(report_1.ChartResponse.decode(message));
                 buffer = buffer.slice(4 + msgLen);
             }
         }
     }
-    SystemIoReport(request) {
-        return new Promise(async (resolve, reject) => {
-            let systemIo = (0, system_io_1.getSystemIoCache)();
-            if (systemIo != null) {
-                resolve({
-                    cost: 0,
-                    ios: systemIo,
-                    records: systemIo.length,
-                });
-                return;
-            }
-            const response = await fetch(`${this.url}/${this.namespace}/SystemIoReport`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.SystemIoRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                let systemIo = report_1.SystemIoResponse.decode(new Uint8Array(await response.arrayBuffer()));
-                (0, system_io_1.setSystemIoCache)(systemIo.ios);
-                resolve(systemIo);
-            }
-            else {
-                reject(await response.text());
-            }
-        });
-    }
-    WorkflowReport(request) {
-        return new Promise(async (resolve, reject) => {
-            const response = await fetch(`${this.url}/${this.namespace}/WorkflowReport`, {
-                method: "POST",
-                headers: this.headers,
-                body: new Uint8Array(report_1.WorkflowRequest.encode(request).finish()),
-            });
-            if (response.ok) {
-                resolve(report_1.WorkflowResponse.decode(new Uint8Array(await response.arrayBuffer())));
-            }
-            else {
-                reject(await response.text());
-            }
-        });
+    /**
+     * Fetches System IO data, using a cache first.
+     */
+    async SystemIoReport(request) {
+        const cachedIo = (0, system_io_1.getSystemIoCache)();
+        if (cachedIo != null) {
+            return { cost: 0, ios: cachedIo, records: cachedIo.length };
+        }
+        const response = await this._call("SystemIoReport", request, report_1.SystemIoRequest, report_1.SystemIoResponse);
+        (0, system_io_1.setSystemIoCache)(response.ios);
+        return response;
     }
+    /**
+     * A helper that uses SystemIoReport internally if needed.
+     */
     async SystemIoCast(systemIo, deviceIo, data) {
-        return new Promise(async (resolve) => {
-            if (systemIo == null) {
-                let result = await this.SystemIoReport({});
-                if (result == null || result.ios == null || result.ios.length == 0) {
-                    resolve([]);
-                    return;
-                }
-                systemIo = result.ios;
+        var _a;
+        let ioData = systemIo;
+        if (ioData == null) {
+            try {
+                const result = await this.SystemIoReport({}); // This call is now authenticated
+                if (!((_a = result === null || result === void 0 ? void 0 : result.ios) === null || _a === void 0 ? void 0 : _a.length))
+                    return [];
+                ioData = result.ios;
+            }
+            catch (error) {
+                console.error("Failed to fetch SystemIoReport in SystemIoCast:", error);
+                return [];
             }
-            resolve((0, system_io_2.default)(systemIo, deviceIo, data));
-            return;
-        });
+        }
+        return (0, system_io_2.default)(ioData, deviceIo, data);
     }
 }
 exports.ReportService = ReportService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fatehan/tsrp",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "description": "fatehan main models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@types/google-protobuf": "^3.15.12",
     "@types/long": "^5.0.0",
-    "@types/node": "^24.5.0",
+    "@types/node": "^24.5.2",
     "ts-node": "^10.9.2",
     "ts-proto": "^2.7.7",
     "typescript": "^5.9.2",