@elara-services/packages 6.0.11 → 6.1.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@elara-services/packages",
-    "version": "6.0.11",
+    "version": "6.1.1",
     "description": "",
     "main": "./dist/src/index.js",
     "author": "SUPERCHIEFYT (Elara-Discord-Bots, Elara-Services)",
@@ -9,8 +9,8 @@
         "build": "rm -rf dist && rm -rf docs && tsc && npx typedoc src/index.ts",
         "pub": "npm run build && npm publish",
         "lint": "eslint .",
-        "prettier:format": "prettier --write src/**/*.ts",
-        "prettier:check": "prettier --check src/**/*.ts"
+        "pf": "prettier --write src/**/*.ts",
+        "pc": "prettier --check src/**/*.ts"
     },
     "repository": {
         "type": "git",
@@ -34,11 +34,12 @@
         "typescript": "5.1.3"
     },
     "optionalDependencies": {
-        "@elara-services/fetch": "2.0.1",
-        "node-schedule": "2.1.1"
+        "@elara-services/fetch": "2.0.1"
     },
     "dependencies": {
-        "@elara-services/utils": "^1.2.31",
-        "discord-api-types": "0.37.48"
+        "@elara-services/utils": "^2.0.18",
+        "discord-api-types": "0.37.48",
+        "eventemitter3": "^5.0.1",
+        "node-schedule": "^2.1.1"
     }
 }

package/dist/src/lib/misc.d.ts

@@ -1 +1 @@
-export declare function fetch<B extends object, T>(url: string, key?: string, body?: B | undefined, postRequest?: boolean, returnRaw?: boolean, addHeaders?: Record<string, string | number>): Promise<T | null>;
+export declare function fetch<B extends object, T>(url: string, key?: string, body?: B | undefined, postRequest?: boolean, returnRaw?: boolean, addHeaders?: Record<string, string | number>, errors?: (e: Error) => Promise<unknown> | unknown): Promise<T | null>;

package/dist/src/lib/misc.js

@@ -34,7 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetch = void 0;
 const utils_1 = require("@elara-services/utils");
-function fetch(url, key = "", body = undefined, postRequest = false, returnRaw = false, addHeaders) {
+function fetch(url, key = "", body = undefined, postRequest = false, returnRaw = false, addHeaders, errors) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const client = yield Promise.resolve().then(() => __importStar(require("@elara-services/fetch"))).catch(() => { });
@@ -60,8 +60,17 @@ function fetch(url, key = "", body = undefined, postRequest = false, returnRaw =
                 .header(headers)
                 .body(body, "json")
                 .send()
-                .catch(() => ({ statusCode: 500, body: "", json: () => "" }));
+                .catch((e) => new Error(e));
+            if (res instanceof Error) {
+                if (errors) {
+                    errors(res);
+                }
+                return null;
+            }
             if (res.statusCode !== 200) {
+                if (errors) {
+                    errors(new Error(`Got (${res.statusCode}) status while trying to fetch ${url}`));
+                }
                 return null;
             }
             if (returnRaw) {
@@ -69,7 +78,10 @@ function fetch(url, key = "", body = undefined, postRequest = false, returnRaw =
             }
             return res.json();
         }
-        catch (_a) {
+        catch (err) {
+            if (errors) {
+                errors(err instanceof Error ? err : new Error(err));
+            }
             return null;
         }
     });

package/dist/src/lib/tasks.d.ts

@@ -1,8 +1,15 @@
-export declare class Tasks extends null {
-    static create({ id, time, shouldCancel }: TaskCreate | undefined, run: (...args: unknown[]) => Promise<unknown> | unknown): Promise<string | import("node-schedule").Job>;
-    static delete(id: string): Promise<boolean | null>;
-    static has(id: string): Promise<boolean>;
-}
+import { Collection } from "@elara-services/utils";
+import { type Job } from "node-schedule";
+export type TaskCreateRun = (...args: unknown[]) => Promise<unknown> | unknown;
+export declare const Tasks: {
+    create: ({ id, time, shouldCancel }: TaskCreate | undefined, run: TaskCreateRun) => string | Job;
+    has: (id: string) => boolean;
+    delete: (id: string) => boolean;
+    cancelAll: () => void;
+    list: () => Collection<string, Job>;
+    dateFrom: (ms: number) => string;
+    repeat: (id: string, ms: number, run: TaskCreateRun) => void;
+};
 export interface TaskCreate {
     id: string;
     time: string;

package/dist/src/lib/tasks.js

@@ -1,81 +1,57 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tasks = void 0;
 const utils_1 = require("@elara-services/utils");
-class Tasks extends null {
-    static create({ id, time, shouldCancel } = {
+const node_schedule_1 = require("node-schedule");
+exports.Tasks = {
+    create: ({ id, time, shouldCancel } = {
         id: "",
         time: "",
         shouldCancel: true,
-    }, run) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sc = yield Promise.resolve().then(() => __importStar(require("node-schedule"))).catch(() => { });
-            if (!sc) {
-                return `Unable to find the "node-schedule" package.`;
-            }
-            if (!utils_1.is.string(id) || !utils_1.is.string(time) || !utils_1.is.boolean(shouldCancel)) {
-                return `You failed to provide one of the following options: 'id', 'time' or 'shouldCancel'`;
-            }
-            if (sc.scheduledJobs[id]) {
-                return `Found (${id}) in the scheduled jobs, ignoring.`;
+    }, run) => {
+        if (!utils_1.is.string(id) || !utils_1.is.string(time) || !utils_1.is.boolean(shouldCancel)) {
+            return `You failed to provide one of the following options: 'id', 'time' or 'shouldCancel'`;
+        }
+        if (node_schedule_1.scheduledJobs[id]) {
+            return `Found (${id}) in the scheduled jobs, ignoring.`;
+        }
+        return (0, node_schedule_1.scheduleJob)(id, time, () => {
+            run();
+            if (shouldCancel) {
+                return void (0, node_schedule_1.cancelJob)(id);
             }
-            return sc.scheduleJob(id, time, () => {
-                run();
-                if (shouldCancel) {
-                    return void sc.cancelJob(id);
-                }
-            });
         });
-    }
-    static delete(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sc = yield Promise.resolve().then(() => __importStar(require("node-schedule"))).catch(() => { });
-            if (!sc) {
-                return null;
+    },
+    has: (id) => node_schedule_1.scheduledJobs[id] ? true : false,
+    delete: (id) => (0, node_schedule_1.cancelJob)(id),
+    cancelAll: () => {
+        for (const v of Object.values(node_schedule_1.scheduledJobs)) {
+            v.cancel();
+        }
+    },
+    list: () => {
+        const list = new utils_1.Collection();
+        for (const v of Object.keys(node_schedule_1.scheduledJobs)) {
+            if (!node_schedule_1.scheduledJobs[v]) {
+                continue;
             }
-            return sc.cancelJob(id);
+            list.set(v, node_schedule_1.scheduledJobs[v]);
+        }
+        return list;
+    },
+    dateFrom: (ms) => new Date(Date.now() + ms).toISOString(),
+    repeat: (id, ms, run) => {
+        if (!id.startsWith("repeat-")) {
+            id = `repeat-${id}-${utils_1.snowflakes.generate()}`;
+        }
+        const schedule = () => exports.Tasks.create({
+            id,
+            time: exports.Tasks.dateFrom(ms),
+            shouldCancel: true,
+        }, () => {
+            exports.Tasks.repeat(`${id.split("-").slice(0, 2).join("-")}-${utils_1.snowflakes.generate()}`, ms, run);
+            run();
         });
-    }
-    static has(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sc = yield Promise.resolve().then(() => __importStar(require("node-schedule"))).catch(() => { });
-            if (!sc) {
-                return false;
-            }
-            return sc.scheduledJobs[id] ? true : false;
-        });
-    }
-}
-exports.Tasks = Tasks;
+        schedule();
+    },
+};