ofsc-utility 1.0.18 → 1.0.20

package/dist/events/index.d.ts

@@ -4,4 +4,13 @@ type AnyObject = {
 export declare function flattenObject(obj: AnyObject, parentKey?: string, result?: AnyObject): AnyObject;
 export declare function downloadAllEventsOfDay(clientId: string, clientSecret: string, instanceUrl: string, subscriptionId: string, sinceDate: string, onlyData: boolean): Promise<any[]>;
 export declare function downloadAllEventsOfDayCSV(clientId: string, clientSecret: string, instanceUrl: string, subscriptionId: string, sinceDate: string, onlyData: boolean): Promise<any[]>;
+/**
+ *  Events of last two minutes
+ * @param clientId
+ * @param clientSecret
+ * @param instanceUrl
+ * @param subscriptionId
+ * @returns
+ */
+export declare function downloadAllEventsOfDLastTwoMinutes(clientId: string, clientSecret: string, instanceUrl: string, subscriptionId: string): Promise<any[]>;
 export {};

package/dist/events/index.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.flattenObject = flattenObject;
 exports.downloadAllEventsOfDay = downloadAllEventsOfDay;
 exports.downloadAllEventsOfDayCSV = downloadAllEventsOfDayCSV;
+exports.downloadAllEventsOfDLastTwoMinutes = downloadAllEventsOfDLastTwoMinutes;
 const path_1 = __importDefault(require("path"));
 const index_1 = require("../oauthTokenService/index");
 const utilities_1 = require("../utilities");
+const index_2 = require("../utilities/index");
 function flattenObject(obj, parentKey = "", result = {}) {
     for (const key in obj) {
         const newKey = parentKey ? `${parentKey}_${key}` : key;
@@ -124,3 +126,70 @@ async function downloadAllEventsOfDayCSV(clientId, clientSecret, instanceUrl, su
     }
     return events;
 }
+/**
+ *  Events of last two minutes
+ * @param clientId
+ * @param clientSecret
+ * @param instanceUrl
+ * @param subscriptionId
+ * @returns
+ */
+async function downloadAllEventsOfDLastTwoMinutes(clientId, clientSecret, instanceUrl, subscriptionId) {
+    // All collected events
+    const events = [];
+    const since = (0, index_2.getTimeBefore180SecondsAlt)();
+    let isValidate = (0, index_2.validateDateTimeStrict)(since);
+    if (!isValidate.isValid) {
+        throw new Error(isValidate.error);
+    }
+    // Build initial request URL
+    const baseUrl = `https://${instanceUrl}.fs.ocs.oraclecloud.com/rest/ofscCore/v1/events`;
+    const initialUrl = `${baseUrl}?subscriptionId=${encodeURIComponent(subscriptionId)}&since=${encodeURIComponent(since)}`;
+    console.log("sinceDate", since);
+    let token = await (0, index_1.getOAuthToken)(clientId, clientSecret, instanceUrl);
+    // Get first page
+    let firstPage = await fetchEventsPage(initialUrl, token, clientId, clientSecret, instanceUrl);
+    token = firstPage.token;
+    let nextPage = firstPage.data.nextPage;
+    let found = firstPage.data.found;
+    // Controls infinite loop
+    let lastSeenPage = nextPage;
+    let repeatedPageCount = 0;
+    // Loop through pages
+    while (found && nextPage) {
+        const pageUrl = new URL(baseUrl);
+        pageUrl.search = new URLSearchParams({
+            subscriptionId,
+            page: nextPage,
+            limit: "1000",
+        }).toString();
+        const finalUrl = pageUrl.toString();
+        const result = await fetchEventsPage(finalUrl, token, clientId, clientSecret, instanceUrl);
+        token = result.token;
+        const page = result.data;
+        found = page.found;
+        nextPage = page.nextPage;
+        console.error("nextPage", nextPage, "Records:", page.items?.length, "Time:", page.items?.[0]?.time);
+        // Prevent infinite looping
+        if (nextPage === lastSeenPage) {
+            repeatedPageCount++;
+            if (repeatedPageCount > 10) {
+                console.warn("⚠️ Pagination repeating same page more than 10 times. Stopping.");
+                break;
+            }
+        }
+        else {
+            lastSeenPage = nextPage;
+            repeatedPageCount = 0;
+        }
+        // Add events
+        if (!page.items) {
+            console.warn("⚠️ No items found in page. Stopping.");
+            break;
+        }
+        for (let k of page.items) {
+            events.push(k);
+        }
+    }
+    return events;
+}

package/dist/metadata/capacity.js

@@ -11,7 +11,7 @@ async function getCapacityMetaData(clientId, clientSecret, instanceUrl, token =
         const url = `https://${instanceUrl}.fs.ocs.oraclecloud.com/rest/ofscMetadata/v1/capacityAreas?offset=${offset}&limit=${limit}`;
         const res = await (0, utilities_1.fetchWithRetry)(url, clientId, clientSecret, instanceUrl, token);
         token = res.token;
-        responsedata = [...responsedata, ...res.data.items];
+        responsedata = [...responsedata, ...res.data?.items || []];
         if (!res.data.hasMore)
             break;
         offset = res.data.offset + limit;
@@ -46,7 +46,7 @@ async function capacitycategoriesOfacapacityArea(clientId, clientSecret, instanc
         const url = `https://${instanceUrl}.fs.ocs.oraclecloud.com/rest/ofscMetadata/v1/capacityAreas/${capacityArea.label}/capacityCategories`;
         const res = await (0, utilities_1.fetchWithRetry)(url, clientId, clientSecret, instanceUrl, token);
         token = res.token;
-        for (const category of res.data.items) {
+        for (const category of res.data?.items || []) {
             data.push({
                 "capacityArea": capacityArea.label,
                 "Capacity Category": category.name,

package/dist/utilities/index.d.ts

@@ -18,4 +18,15 @@ export declare function xmlNodeToObjects(xmlString: string, parentNodeName: stri
 type SheetRow = Record<string, unknown>;
 type SheetsData = Record<string, SheetRow[]>;
 export declare function createExcelFile(sheetsData: SheetsData, filename?: string): void;
+interface ValidationResult {
+    isValid: boolean;
+    error?: string;
+}
+/**
+ * Validate Date String Format must be YYYY-MM-DD HH:MM:SS
+ * @param dateTimeStr :string
+ * @returns
+ */
+export declare function validateDateTimeStrict(dateTimeStr: string): ValidationResult;
+export declare function getTimeBefore180SecondsAlt(): string;
 export {};

package/dist/utilities/index.js

@@ -40,6 +40,8 @@ exports.fetchWithRetry = void 0;
 exports.saveCsv = saveCsv;
 exports.xmlNodeToObjects = xmlNodeToObjects;
 exports.createExcelFile = createExcelFile;
+exports.validateDateTimeStrict = validateDateTimeStrict;
+exports.getTimeBefore180SecondsAlt = getTimeBefore180SecondsAlt;
 const XLSX = __importStar(require("xlsx-js-style"));
 const xmldom_1 = require("xmldom");
 const oauthTokenService_1 = require("../oauthTokenService");
@@ -271,3 +273,40 @@ function createExcelFile(sheetsData, filename = 'file.xlsx') {
     XLSX.writeFile(workbook, filename);
     console.log(`✓ Excel file created: ${filename}`);
 }
+/**
+ * Validate Date String Format must be YYYY-MM-DD HH:MM:SS
+ * @param dateTimeStr :string
+ * @returns
+ */
+function validateDateTimeStrict(dateTimeStr) {
+    const regex = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/;
+    const match = dateTimeStr.match(regex);
+    if (!match) {
+        return { isValid: false, error: 'Format must be YYYY-MM-DD HH:MM:SS' };
+    }
+    const [, year, month, day, hours, minutes, seconds] = match.map(Number);
+    if (month < 1 || month > 12) {
+        return { isValid: false, error: 'Month must be between 1 and 12' };
+    }
+    const daysInMonth = new Date(year, month, 0).getDate();
+    if (day < 1 || day > daysInMonth) {
+        return { isValid: false, error: `Day must be between 1 and ${daysInMonth}` };
+    }
+    if (hours < 0 || hours > 23) {
+        return { isValid: false, error: 'Hours must be between 0 and 23' };
+    }
+    if (minutes < 0 || minutes > 59) {
+        return { isValid: false, error: 'Minutes must be between 0 and 59' };
+    }
+    if (seconds < 0 || seconds > 59) {
+        return { isValid: false, error: 'Seconds must be between 0 and 59' };
+    }
+    return { isValid: true };
+}
+function getTimeBefore180SecondsAlt() {
+    const timeBefore = new Date(Date.now() - 180000); // 180 * 1000 = 180000
+    // Convert to ISO string and format
+    return timeBefore.toISOString()
+        .replace('T', ' ')
+        .substring(0, 19);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofsc-utility",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "A wrapper for Oracle Field Service REST API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",