@8ms/helpers 1.33.2 → 1.35.1

package/.github/workflows/deploy_npmjs.yml

@@ -6,12 +6,12 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4.2.1
+      - uses: actions/setup-node@v4.0.4
         with:
-          node-version: 18
+          node-version: 20
       - run: yarn
       - run: yarn build
-      - uses: JS-DevTools/npm-publish@v1
+      - uses: JS-DevTools/npm-publish@v3.1.1
         with:
           token: ${{ secrets.NPM_TOKEN }}

package/api/ApiResponse.d.ts

@@ -1,5 +1,5 @@
-import { Response } from './response';
-import { State } from './states';
+import { Response } from "./response";
+import { State } from "./";
 type Constructor = {
     body?: any;
     error?: any;

package/api/ApiResponse.js

@@ -4,18 +4,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const defaultTo_1 = __importDefault(require("../util/defaultTo"));
-const states_1 = __importDefault(require("./states"));
+const _1 = require("./");
 /**
  * Class version of the API to enable quicker instances.
  */
 class ApiResponse {
     constructor({ body, error, state } = {}) {
-        this.state = states_1.default.IDLE;
+        this.state = _1.State.IDLE;
         this.body = null;
         this.error = null;
         this.body = body || null;
         this.error = error || null;
-        this.state = state || states_1.default.IDLE;
+        this.state = state || _1.State.IDLE;
         return this;
     }
     fromJson({ input }) {
@@ -48,34 +48,34 @@ class ApiResponse {
         return this.state;
     }
     isError() {
-        return this.state === states_1.default.ERROR;
+        return this.state === _1.State.ERROR;
     }
     isIdle() {
-        return this.state === states_1.default.IDLE;
+        return this.state === _1.State.IDLE;
     }
     isPending() {
-        return this.state === states_1.default.PENDING;
+        return this.state === _1.State.PENDING;
     }
     isSuccess() {
-        return this.state === states_1.default.SUCCESS;
+        return this.state === _1.State.SUCCESS;
     }
     setToIdle() {
-        this.state = states_1.default.IDLE;
+        this.state = _1.State.IDLE;
         return this;
     }
     setToPending() {
-        this.state = states_1.default.PENDING;
+        this.state = _1.State.PENDING;
         return this;
     }
     setToError({ body, error }) {
         this.body = body || null;
         this.error = error;
-        this.state = states_1.default.ERROR;
+        this.state = _1.State.ERROR;
         return this;
     }
     setToSuccess({ body }) {
         this.body = body;
-        this.state = states_1.default.SUCCESS;
+        this.state = _1.State.SUCCESS;
         return this;
     }
     setBody({ body }) {

package/api/index.d.ts

@@ -0,0 +1,8 @@
+export declare enum State {
+    ERROR = "ERROR",
+    IDLE = "IDLE",
+    PENDING = "PENDING",
+    SUCCESS = "SUCCESS",
+    VALIDATION_ERROR = "VALIDATION_ERROR"
+}
+export declare const unexpectedError: string;

package/api/index.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unexpectedError = exports.State = void 0;
+var State;
+(function (State) {
+    State["ERROR"] = "ERROR";
+    State["IDLE"] = "IDLE";
+    State["PENDING"] = "PENDING";
+    State["SUCCESS"] = "SUCCESS";
+    State["VALIDATION_ERROR"] = "VALIDATION_ERROR";
+})(State || (exports.State = State = {}));
+exports.unexpectedError = "An unexpected error occurred, please try again.";

package/api/isError.d.ts

@@ -1,6 +1,6 @@
-import { Response } from './response';
+import { Response } from "./response";
 type IsError = {
     response: Response;
 };
-declare const isError: ({ response }: IsError) => boolean;
+declare const isError: (props: IsError) => boolean;
 export default isError;

package/api/isError.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const states_1 = __importDefault(require("./states"));
-const isError = ({ response }) => {
-    return states_1.default.ERROR === response.state;
+const _1 = require("./");
+const isError = (props) => {
+    return _1.State.ERROR === props.response.state;
 };
 exports.default = isError;

package/api/isSuccess.d.ts

@@ -2,5 +2,5 @@ import { Response } from './response';
 type IsSuccess = {
     response: Response;
 };
-declare const isSuccess: ({ response }: IsSuccess) => boolean;
+declare const isSuccess: (props: IsSuccess) => boolean;
 export default isSuccess;

package/api/isSuccess.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const states_1 = __importDefault(require("./states"));
-const isSuccess = ({ response }) => {
-    return states_1.default.SUCCESS === response.state;
+const _1 = require("./");
+const isSuccess = (props) => {
+    return _1.State.SUCCESS === props.response.state;
 };
 exports.default = isSuccess;

package/api/response.d.ts

@@ -1,4 +1,4 @@
-import { State } from './states';
+import { State } from "./";
 export type Response = {
     body: any | null;
     error: string | null;

package/api/response.js

@@ -1,12 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const states_1 = __importDefault(require("./states"));
+const _1 = require("./");
 const response = {
     body: null,
     error: null,
-    state: states_1.default.IDLE,
+    state: _1.State.IDLE,
 };
 exports.default = response;

package/aws/s3/listFilesIteratively.d.ts

@@ -0,0 +1,9 @@
+type ListFilesIteratively = {
+    bucket: string;
+    folder: string;
+};
+/**
+ * Fetch all the files within a given directory recursively
+ */
+declare const listFilesIteratively: (props: ListFilesIteratively) => Promise<string[]>;
+export default listFilesIteratively;

package/aws/s3/listFilesIteratively.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const listFolders_1 = __importDefault(require("./listFolders"));
+const listFiles_1 = __importDefault(require("./listFiles"));
+/**
+ * Sub function
+ */
+const iterateFolders = async (props) => {
+    let response = [];
+    const folders = await (0, listFolders_1.default)({
+        bucket: props.bucket,
+        folder: props.folder,
+    });
+    for (let i = 0; i < folders.length; i++) {
+        const subFolderFiles = await iterateFolders({
+            bucket: props.bucket,
+            folder: `${props.folder}/${folders[i]}`,
+        });
+        const files = await (0, listFiles_1.default)({
+            bucket: props.bucket,
+            folder: `${props.folder}/${folders[i]}`,
+        });
+        response = [
+            ...response,
+            ...files,
+            ...subFolderFiles,
+        ];
+    }
+    return response;
+};
+/**
+ * Fetch all the files within a given directory recursively
+ */
+const listFilesIteratively = async (props) => {
+    const response = await iterateFolders({
+        bucket: props.bucket,
+        folder: props.folder,
+    });
+    return response;
+};
+exports.default = listFilesIteratively;

package/aws/s3/readBuffer.d.ts

@@ -1,4 +1,4 @@
-import { Modified } from './readFile';
+import { Modified } from "./readFile";
 export type ReadBufferResponse = Modified & {
     buffer: any;
 };

package/aws/s3/readBuffer.js

@@ -3,30 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const date_fns_1 = require("date-fns");
 const isResponse200_1 = __importDefault(require("../isResponse200"));
+const readFile_1 = require("./readFile");
 /**
  * Similar function to reading the S3 file, but instead of a text file return a buffer.
  */
 const readBuffer = async ({ bucket, key }) => {
     let response = {
+        ...readFile_1.readFileDefault,
         buffer: undefined,
-        now: (0, date_fns_1.getUnixTime)(new Date()),
-        modified: {
-            unix: null,
-            vsNow: {
-                months: 0,
-                days: 0,
-                hours: 0,
-                minutes: 0,
-            },
-            vsMidnight: {
-                hours: 0,
-                minutes: 0,
-            },
-        },
     };
-    const { GetObjectCommand } = require('@aws-sdk/client-s3');
+    const { GetObjectCommand } = require("@aws-sdk/client-s3");
     const apiResponse = await global.awsS3Client.send(new GetObjectCommand({
         Bucket: bucket,
         Key: key,
@@ -37,11 +24,11 @@ const readBuffer = async ({ bucket, key }) => {
         // Store the response
         response.buffer = await new Promise((resolve, reject) => {
             // @ts-ignore
-            apiResponse.Body.on('data', (chunk) => chunks.push(chunk));
+            apiResponse.Body.on("data", (chunk) => chunks.push(chunk));
             // @ts-ignore
-            apiResponse.Body.on('error', (err) => reject(err));
+            apiResponse.Body.on("error", (err) => reject(err));
             // @ts-ignore
-            apiResponse.Body.on('end', () => resolve(Buffer.concat(chunks)));
+            apiResponse.Body.on("end", () => resolve(Buffer.concat(chunks)));
         });
     }
     else {

package/aws/s3/readFile.d.ts

@@ -1,14 +1,15 @@
+import { DurationComparison } from "../../date";
 export type Modified = {
     now: number;
     modified: {
         unix: null | number;
-        vsNow: {
+        [DurationComparison.VS_NOW]: {
             months: number;
             days: number;
             hours: number;
             minutes: number;
         };
-        vsMidnight: {
+        [DurationComparison.VS_MIDNIGHT]: {
             hours: number;
             minutes: number;
         };

package/aws/s3/readFile.js

@@ -17,18 +17,19 @@ const getStringFromStream_1 = __importDefault(require("../../string/getStringFro
 const isResponse200_1 = __importDefault(require("../isResponse200"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const isFileExists_1 = __importDefault(require("./isFileExists"));
+const date_1 = require("../../date");
 exports.readFileDefault = {
     body: undefined,
     now: undefined,
     modified: {
         unix: null,
-        vsNow: {
+        [date_1.DurationComparison.VS_NOW]: {
             months: 0,
             days: 0,
             hours: 0,
             minutes: 0,
         },
-        vsMidnight: {
+        [date_1.DurationComparison.VS_MIDNIGHT]: {
             hours: 0,
             minutes: 0,
         },
@@ -49,7 +50,7 @@ const readFile = async ({ bucket, key, isJson }) => {
     });
     // Only fetch the file if it exists
     if (doesFileExist) {
-        const { GetObjectCommand } = require('@aws-sdk/client-s3');
+        const { GetObjectCommand } = require("@aws-sdk/client-s3");
         const apiResponse = await global.awsS3Client.send(new GetObjectCommand({
             Bucket: bucket,
             Key: key,
@@ -60,15 +61,17 @@ const readFile = async ({ bucket, key, isJson }) => {
             // Convert the date to unix
             response.modified.unix = (0, date_fns_7.getUnixTime)(modified);
             // Compare now to unix
-            response.modified.vsNow.months = (0, date_fns_4.differenceInMonths)(now, modified);
-            response.modified.vsNow.days = (0, date_fns_1.differenceInDays)(now, modified);
-            response.modified.vsNow.hours = (0, date_fns_2.differenceInHours)(now, modified);
-            response.modified.vsNow.minutes = (0, date_fns_3.differenceInMinutes)(now, modified);
+            response.modified[date_1.DurationComparison.VS_NOW].months = (0, date_fns_4.differenceInMonths)(now, modified);
+            response.modified[date_1.DurationComparison.VS_NOW].days = (0, date_fns_1.differenceInDays)(now, modified);
+            response.modified[date_1.DurationComparison.VS_NOW].hours = (0, date_fns_2.differenceInHours)(now, modified);
+            response.modified[date_1.DurationComparison.VS_NOW].minutes = (0, date_fns_3.differenceInMinutes)(now, modified);
             // Compare now to midnight
-            response.modified.vsMidnight.hours = (0, date_fns_5.getHours)(now);
-            response.modified.vsMidnight.minutes = (0, date_fns_6.getMinutes)(now);
+            response.modified[date_1.DurationComparison.VS_MIDNIGHT].hours = (0, date_fns_5.getHours)(now);
+            response.modified[date_1.DurationComparison.VS_MIDNIGHT].minutes = (0, date_fns_6.getMinutes)(now);
             // Convert stream into a string
-            response.body = await (0, getStringFromStream_1.default)({ stream: apiResponse.Body });
+            response.body = await (0, getStringFromStream_1.default)({
+                stream: apiResponse.Body
+            });
             // If we need to return JSON, parse it. On error return undefined
             if (false !== isJson) {
                 response.body = JSON.parse(response.body) || undefined;

package/aws/s3cache/getCache.d.ts

@@ -1,5 +1,5 @@
-import { Cache } from './cache';
-import { GetKey } from './getKey';
+import { Cache } from "./";
+import { GetKey } from "./getKey";
 type GetCache = GetKey & {
     bucket: string;
     cache: Cache;

package/aws/s3cache/getCache.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const durations_1 = __importDefault(require("../../date/durations"));
+const date_1 = require("../../date");
 const getKey_1 = __importDefault(require("./getKey"));
 const readGzip_1 = __importDefault(require("../s3/readGzip"));
 /**
@@ -23,7 +23,7 @@ const getCache = async ({ bucket, cache, fileName, folder }) => {
                 isJson: true,
             });
             // Cache exists and is still within our caching timeframe
-            if (undefined !== cached.body && (durations_1.default.FOREVER === cache.timeframe || cached.modified[cache.from][cache.timeframe] < cache.duration)) {
+            if (undefined !== cached.body && (date_1.Interval.FOREVER === cache.timeframe || cached.modified[cache.from][cache.timeframe] < cache.duration)) {
                 response = cached.body;
             }
         }

package/aws/s3cache/index.d.ts

@@ -0,0 +1,6 @@
+import { DurationComparison, Interval } from "../../date";
+export type Cache = {
+    duration: number;
+    from: DurationComparison;
+    timeframe: Interval;
+};

package/aws/s3cache/updateCache.d.ts

@@ -1,6 +1,6 @@
 import { GetKey } from './getKey';
 type UpdateCache = GetKey & {
-    bucket: any;
+    bucket: string;
     data: any;
 };
 /**

package/brightData/webScraperIde/getRealtime.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const post_1 = __importDefault(require("../../axios/post"));
-const states_1 = __importDefault(require("../../api/states"));
+const api_1 = require("../../api");
 const get_1 = __importDefault(require("../../axios/get"));
 const sleep_1 = __importDefault(require("../../util/sleep"));
 /**
@@ -30,8 +30,8 @@ const getRealtime = async (props) => {
             keys: ["response_id"],
         });
         if ("" !== responseId) {
-            let state = states_1.default.PENDING;
-            while (states_1.default.PENDING === state) {
+            let state = api_1.State.PENDING;
+            while (api_1.State.PENDING === state) {
                 const resultUrl = `https://api.brightdata.com/dca/get_result?response_id=${responseId}`;
                 // Use fetch with the agent option to make an HTTP request through the proxy
                 // Replace <target_url> with the URL you want to request
@@ -46,10 +46,10 @@ const getRealtime = async (props) => {
                 if (resultResponse.isSuccess()) {
                     if (undefined !== resultResponse.body.pending &&
                         true === resultResponse.body.pending) {
-                        state = states_1.default.PENDING;
+                        state = api_1.State.PENDING;
                     }
                     else {
-                        state = states_1.default.SUCCESS;
+                        state = api_1.State.SUCCESS;
                         response = resultResponse.getBody();
                     }
                 }

package/crud/index.d.ts

@@ -0,0 +1,6 @@
+export declare enum Action {
+    CREATE = "CREATE",
+    READ = "READ",
+    UPDATE = "UPDATE",
+    DELETE = "DELETE"
+}

package/crud/index.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Action = void 0;
+var Action;
+(function (Action) {
+    Action["CREATE"] = "CREATE";
+    Action["READ"] = "READ";
+    Action["UPDATE"] = "UPDATE";
+    Action["DELETE"] = "DELETE";
+})(Action || (exports.Action = Action = {}));

package/date/getDate.d.ts

@@ -1,4 +1,4 @@
-import { DateType } from "./date";
+import { DateType } from "./";
 import { GetMidnight } from "./getMidnight";
 import { GetTimeZoned } from "./getTimeZoned";
 export type GetDate = GetTimeZoned & GetMidnight & {

package/date/getDatesBetween.d.ts

@@ -1,4 +1,4 @@
-import { DateType } from "./date";
+import { DateType } from "./";
 type GetDatesBetween = {
     end: DateType;
     start: DateType;

package/date/getFinancialYear.d.ts

@@ -1,4 +1,4 @@
-import { FinancialYear } from './financialYear';
+import { FinancialYear } from "./";
 type GetFinancialYearType = {
     year?: number;
 };

package/date/getFinancialYear.js

@@ -4,9 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const date_fns_1 = require("date-fns");
-const date_fns_2 = require("date-fns");
-const date_fns_3 = require("date-fns");
-const date_fns_4 = require("date-fns");
 const getDate_1 = __importDefault(require("./getDate"));
 const getToday_1 = __importDefault(require("./getToday"));
 /**
@@ -41,11 +38,11 @@ const getFinancialYear = (props = {}) => {
     });
     // Get the previous Monday if the 1st of April isn't a Monday
     if (!(0, date_fns_1.isMonday)(yearStart)) {
-        yearStart = (0, date_fns_4.previousMonday)(yearStart);
+        yearStart = (0, date_fns_1.previousMonday)(yearStart);
     }
     // Get the next Sunday if the 31st of March isn't a Sunday
-    if (!(0, date_fns_2.isSunday)(yearEnd)) {
-        yearEnd = (0, date_fns_3.nextSunday)(yearEnd);
+    if (!(0, date_fns_1.isSunday)(yearEnd)) {
+        yearEnd = (0, date_fns_1.nextSunday)(yearEnd);
     }
     return {
         end: yearEnd,

package/date/getFinancialYearToDate.d.ts

@@ -1,4 +1,4 @@
-import { FinancialYear } from './financialYear';
+import { FinancialYear } from './';
 /**
  * Return the current financial year up to today.
  * Timezone should always be London based

package/date/getFinancialYearToYesterday.d.ts

@@ -1,4 +1,4 @@
-import { FinancialYear } from './financialYear';
+import { FinancialYear } from './';
 /**
  * Return the current financial year up to yesterday.
  * Timezone should always be London based

package/date/getFinancialYearWeeks.d.ts

@@ -1,4 +1,4 @@
-import { FinancialYearWeekType } from "./financialYearWeek";
+import { FinancialYearWeekType } from "./";
 type GetFinancialYearWeeks = {
     year?: number;
 };

package/date/getFinancialYearWeeks.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const date_fns_1 = require("date-fns");
-const date_fns_2 = require("date-fns");
 const getFinancialYear_1 = __importDefault(require("./getFinancialYear"));
 const getTimeZoned_1 = __importDefault(require("./getTimeZoned"));
 /**
@@ -14,7 +13,7 @@ const getFinancialYearWeeks = (props = {}) => {
     const financialYear = (0, getFinancialYear_1.default)({
         year: props.year
     });
-    const weeks = (0, date_fns_2.eachWeekOfInterval)(financialYear, {
+    const weeks = (0, date_fns_1.eachWeekOfInterval)(financialYear, {
         weekStartsOn: 1
     });
     let response = weeks.map((week, index) => {

package/date/getLastWeek.d.ts

@@ -1,6 +1,6 @@
 import { GetMidnight } from "./getMidnight";
 import { GetTimeZoned } from "./getTimeZoned";
-import { Timeframe } from "./timeframe";
+import { Timeframe } from "./";
 type GetLastWeek = GetTimeZoned & GetMidnight;
 /**
  * Return an object of start/end predefined date of Last Week.

package/date/getMax.d.ts

@@ -1,4 +1,4 @@
-import { DateType } from "./date";
+import { DateType } from "./";
 import { GetMidnight } from "./getMidnight";
 import { GetTimeZoned } from "./getTimeZoned";
 type GetMax = GetTimeZoned & GetMidnight & {

package/date/getMin.d.ts

@@ -1,4 +1,4 @@
-import { DateType } from './date';
+import { DateType } from './';
 import { GetMidnight } from './getMidnight';
 import { GetTimeZoned } from './getTimeZoned';
 type GetMin = GetTimeZoned & GetMidnight & {

package/date/getMonday.d.ts

@@ -1,6 +1,6 @@
-import { DateType } from './date';
-import { GetMidnight } from './getMidnight';
-import { GetTimeZoned } from './getTimeZoned';
+import { DateType } from "./";
+import { GetMidnight } from "./getMidnight";
+import { GetTimeZoned } from "./getTimeZoned";
 type GetMonday = GetTimeZoned & GetMidnight & {
     input?: DateType;
     isUtc?: boolean;

package/date/getMonday.js

@@ -4,8 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const date_fns_1 = require("date-fns");
-const date_fns_2 = require("date-fns");
-const date_fns_3 = require("date-fns");
 const getDate_1 = __importDefault(require("./getDate"));
 const getMidnight_1 = __importDefault(require("./getMidnight"));
 const getToday_1 = __importDefault(require("./getToday"));
@@ -30,14 +28,14 @@ const getMonday = (props) => {
         });
         //		console.log('dateInstance', dateInstance);
     }
-    if (!(0, date_fns_2.isMonday)(dateInstance)) {
+    if (!(0, date_fns_1.isMonday)(dateInstance)) {
         // Get the ISO Day of week (Monday - 1 to Sunday - 7)
         const isoDay = (0, date_fns_1.getISODay)(dateInstance);
         // Move back to Monday
-        dateInstance = (0, date_fns_3.subDays)(dateInstance, isoDay - 1);
+        dateInstance = (0, date_fns_1.subDays)(dateInstance, isoDay - 1);
     }
     // Move it back a given number of weeks
-    dateInstance = (0, date_fns_3.subDays)(dateInstance, 7 * props.weeksAgo);
+    dateInstance = (0, date_fns_1.subDays)(dateInstance, 7 * props.weeksAgo);
     //	console.log('dateInstance', dateInstance);
     dateInstance = (0, getMidnight_1.default)({
         input: dateInstance,

package/date/getPredefinedTimeframe.d.ts

@@ -1,9 +1,8 @@
-import { PredefinedTimeframes } from './predefinedTimeframes';
-import { Timeframe } from './timeframe';
+import { PredefinedTimeframe, Timeframe } from "./";
 /**
  * Check to see the date matches a predefined time frame
  */
 declare const getPredefinedTimeframe: ({ timeframe }: {
     timeframe: Timeframe;
-}) => PredefinedTimeframes;
+}) => PredefinedTimeframe;
 export default getPredefinedTimeframe;