fix(core): update
This commit is contained in:
@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@pushrocks/smarttime',
|
||||
version: '3.0.46',
|
||||
version: '3.0.47',
|
||||
description: 'handle time in smart ways'
|
||||
}
|
||||
|
16
ts/index.ts
16
ts/index.ts
@ -1,8 +1,8 @@
|
||||
export * from './smarttime.classes.cronmanager';
|
||||
export * from './smarttime.classes.cronjob';
|
||||
export * from './smarttime.classes.extendeddate';
|
||||
export * from './smarttime.classes.hrtmeasurement';
|
||||
export * from './smarttime.classes.interval';
|
||||
export * from './smarttime.classes.timer';
|
||||
export * from './smarttime.classes.timestamp';
|
||||
export * from './smarttime.units';
|
||||
export * from './smarttime.classes.cronmanager.js';
|
||||
export * from './smarttime.classes.cronjob.js';
|
||||
export * from './smarttime.classes.extendeddate.js';
|
||||
export * from './smarttime.classes.hrtmeasurement.js';
|
||||
export * from './smarttime.classes.interval.js';
|
||||
export * from './smarttime.classes.timer.js';
|
||||
export * from './smarttime.classes.timestamp.js';
|
||||
export * from './smarttime.units.js';
|
||||
|
@ -1,9 +1,11 @@
|
||||
import * as plugins from './smarttime.plugins';
|
||||
import { CronManager } from './smarttime.classes.cronmanager';
|
||||
import * as plugins from './smarttime.plugins.js';
|
||||
import { CronManager } from './smarttime.classes.cronmanager.js';
|
||||
|
||||
import { CronParser } from './smarttime.classes.cronparser';
|
||||
import { CronParser } from './smarttime.classes.cronparser.js';
|
||||
|
||||
export type TJobFunction = ((triggerTimeArg?: number) => void) | ((triggerTimeArg?: number) => Promise<any>);
|
||||
export type TJobFunction =
|
||||
| ((triggerTimeArg?: number) => void)
|
||||
| ((triggerTimeArg?: number) => Promise<any>);
|
||||
|
||||
export class CronJob {
|
||||
public cronParser: typeof plugins.croner;
|
||||
@ -28,7 +30,7 @@ export class CronJob {
|
||||
if (Date.now() > this.nextExecutionUnix) {
|
||||
const maybePromise = this.jobFunction(this.nextExecutionUnix);
|
||||
if (maybePromise instanceof Promise) {
|
||||
maybePromise.catch(e => console.log(e));
|
||||
maybePromise.catch((e) => console.log(e));
|
||||
}
|
||||
this.nextExecutionUnix = this.getNextExecutionTime();
|
||||
}
|
||||
@ -36,7 +38,7 @@ export class CronJob {
|
||||
}
|
||||
|
||||
public getNextExecutionTime() {
|
||||
return this.nextExecutionUnix = Date.now() + this.getTimeToNextExecution();
|
||||
return (this.nextExecutionUnix = Date.now() + this.getTimeToNextExecution());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1,6 +1,6 @@
|
||||
import * as plugins from './smarttime.plugins';
|
||||
import { CronJob } from './smarttime.classes.cronjob';
|
||||
import { getMilliSecondsAsHumanReadableString } from './smarttime.units';
|
||||
import * as plugins from './smarttime.plugins.js';
|
||||
import { CronJob } from './smarttime.classes.cronjob.js';
|
||||
import { getMilliSecondsAsHumanReadableString } from './smarttime.units.js';
|
||||
|
||||
export class CronManager {
|
||||
public executionTimeout: plugins.smartdelay.Timeout<void>;
|
||||
|
@ -1,4 +1,4 @@
|
||||
import * as plugins from './smarttime.plugins';
|
||||
import * as plugins from './smarttime.plugins.js';
|
||||
|
||||
export class CronParser {
|
||||
public cronExpression: string;
|
||||
@ -62,7 +62,7 @@ export class CronParser {
|
||||
if (targetHour < currentHour) {
|
||||
currentDay = (currentDay + 1) % 30;
|
||||
}
|
||||
|
||||
|
||||
const targetDay = currentDay;
|
||||
if (targetDay < currentDay) {
|
||||
currentMonth = (currentMonth + 1) % 11;
|
||||
@ -70,7 +70,7 @@ export class CronParser {
|
||||
|
||||
const targetMonth = currentMonth;
|
||||
if (targetMonth < currentMonth) {
|
||||
currentYear = (currentYear + 1);
|
||||
currentYear = currentYear + 1;
|
||||
}
|
||||
const targetYear = currentYear;
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import * as plugins from './smarttime.plugins';
|
||||
import * as units from './smarttime.units';
|
||||
import * as plugins from './smarttime.plugins.js';
|
||||
import * as units from './smarttime.units.js';
|
||||
|
||||
export type TAvailableZone = 'Europe/Berlin';
|
||||
|
||||
@ -128,14 +128,14 @@ export class ExtendedDate extends Date {
|
||||
};
|
||||
}
|
||||
|
||||
public format (formatArg: string) {
|
||||
public format(formatArg: string) {
|
||||
return plugins.dayjs(this.getTime()).format(formatArg);
|
||||
}
|
||||
|
||||
/**
|
||||
* boolean checks
|
||||
*/
|
||||
public isToday () {
|
||||
public isToday() {
|
||||
return plugins.dayjs(this.getTime()).isToday();
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import * as plugins from './smarttime.plugins';
|
||||
import * as plugins from './smarttime.plugins.js';
|
||||
|
||||
export class Interval {
|
||||
public status: 'started' | 'stopped' | 'initial' = 'initial';
|
||||
|
@ -1,6 +1,6 @@
|
||||
import * as plugins from './smarttime.plugins';
|
||||
import * as plugins from './smarttime.plugins.js';
|
||||
|
||||
import { TimeStamp } from './smarttime.classes.timestamp';
|
||||
import { TimeStamp } from './smarttime.classes.timestamp.js';
|
||||
|
||||
export type TimerState = 'initiated' | 'started' | 'paused' | 'completed';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import * as plugins from './smarttime.plugins';
|
||||
import * as plugins from './smarttime.plugins.js';
|
||||
|
||||
/**
|
||||
* TimeStamp
|
||||
|
@ -6,9 +6,9 @@ import * as smartpromise from '@pushrocks/smartpromise';
|
||||
export { lik, smartdelay, smartpromise };
|
||||
|
||||
// third parties;
|
||||
const croner: any = require('croner');
|
||||
import croner from 'croner';
|
||||
import dayjs from 'dayjs';
|
||||
import isToday from 'dayjs/plugin/isToday';
|
||||
import isToday from 'dayjs/plugin/isToday.js';
|
||||
import prettyMs from 'pretty-ms';
|
||||
|
||||
dayjs.extend(isToday);
|
||||
|
@ -1,4 +1,4 @@
|
||||
import * as plugins from './smarttime.plugins';
|
||||
import * as plugins from './smarttime.plugins.js';
|
||||
|
||||
export let units = {
|
||||
years: (timesArg = 1): number => {
|
||||
@ -59,4 +59,4 @@ export let getMilliSecondsFromUnits = (combinationArg: IUnitCombinationArg) => {
|
||||
|
||||
export const getMilliSecondsAsHumanReadableString = (milliSecondsArg: number): string => {
|
||||
return plugins.prettyMs(milliSecondsArg);
|
||||
}
|
||||
};
|
||||
|
Reference in New Issue
Block a user