@ldsg/schedules 0.3.31 → 0.3.33

package/dist/constants.d.ts

@@ -1,6 +1,6 @@
-import { HandlerSpecificResourceSettings } from '@ldsg/handler';
-import { ResourceDefinitionSpecificResourceSettings } from '@ldsg/resource-definition';
-import { GeneralResourceSettings } from '@ldsg/types';
+import { HandlerSpecificResourceSettings } from "@ldsg/handler";
+import { ResourceDefinitionSpecificResourceSettings } from "@ldsg/resource-definition";
+import { GeneralResourceSettings } from "@ldsg/types";
 export declare const INSTANTIATE_RESOURCE_HANDLER_GENERAL_RESOURCE_SETTINGS: GeneralResourceSettings;
 export declare const INSTANTIATE_RESOURCE_HANDLER_SPECIFIC_RESOURCE_SETTINGS: HandlerSpecificResourceSettings;
 export declare const RESOURCE_DEFINITION_GENERAL_RESOURCE_SETTINGS: GeneralResourceSettings;

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,0CAA0C,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,eAAO,MAAM,sDAAsD,EAAE,uBAGpE,CAAC;AAEF,eAAO,MAAM,uDAAuD,EAAE,+BAOrE,CAAC;AAEF,eAAO,MAAM,6CAA6C,EAAE,uBAG3D,CAAC;AAEF,eAAO,MAAM,8CAA8C,EAAE,0CAE5D,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,0CAA0C,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,eAAO,MAAM,sDAAsD,EAAE,uBAGpE,CAAC;AAEF,eAAO,MAAM,uDAAuD,EAAE,+BAQnE,CAAC;AAEJ,eAAO,MAAM,6CAA6C,EAAE,uBAG3D,CAAC;AAEF,eAAO,MAAM,8CAA8C,EAAE,0CAG1D,CAAC"}

package/dist/constants.js

@@ -2,21 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RESOURCE_DEFINITION_SPECIFIC_RESOURCE_SETTINGS = exports.RESOURCE_DEFINITION_GENERAL_RESOURCE_SETTINGS = exports.INSTANTIATE_RESOURCE_HANDLER_SPECIFIC_RESOURCE_SETTINGS = exports.INSTANTIATE_RESOURCE_HANDLER_GENERAL_RESOURCE_SETTINGS = void 0;
 exports.INSTANTIATE_RESOURCE_HANDLER_GENERAL_RESOURCE_SETTINGS = {
-    title: '定时任务组实例化资源处理程序',
-    description: ''
+    title: "定时任务组实例化资源处理程序",
+    description: "",
 };
 exports.INSTANTIATE_RESOURCE_HANDLER_SPECIFIC_RESOURCE_SETTINGS = {
     code: `export * from "@ldsg/schedules";`,
     dependencies: [
         {
-            name: '@ldsg/schedules'
-        }
-    ]
+            name: "@ldsg/schedules",
+        },
+    ],
 };
 exports.RESOURCE_DEFINITION_GENERAL_RESOURCE_SETTINGS = {
-    title: '定时任务组资源定义',
-    description: ''
+    title: "定时任务组资源定义",
+    description: "",
 };
 exports.RESOURCE_DEFINITION_SPECIFIC_RESOURCE_SETTINGS = {
-    kind: 'schedules'
+    kind: "schedules",
 };

package/dist/handler.d.ts

@@ -1,6 +1,6 @@
-import { Handler } from '@ldsg/handler';
-import { InstantiateResourceParams, InstantiateResourceRes } from '@ldsg/resource';
-import { SchedulesResource } from './resource';
-import { SchedulesSpecificResourceSettings } from './types';
+import { Handler } from "@ldsg/handler";
+import { InstantiateResourceParams, InstantiateResourceRes } from "@ldsg/resource";
+import { SchedulesResource } from "./resource";
+import { SchedulesSpecificResourceSettings } from "./types";
 export declare const handler: Handler<InstantiateResourceParams<SchedulesSpecificResourceSettings>, InstantiateResourceRes<SchedulesResource>>;
 //# sourceMappingURL=handler.d.ts.map

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-export * from './constants';
-export * from './handler';
-export * from './instantiate-resource';
-export * from './resource';
-export * from './types';
+export * from "./constants";
+export * from "./handler";
+export * from "./instantiate-resource";
+export * from "./resource";
+export * from "./types";
 //# sourceMappingURL=index.d.ts.map

package/dist/instantiate-resource.d.ts

@@ -1,5 +1,5 @@
-import { InstantiateResource } from '@ldsg/resource';
-import { SchedulesResource } from './resource';
-import { SchedulesSpecificResourceSettings } from './types';
+import { InstantiateResource } from "@ldsg/resource";
+import { SchedulesResource } from "./resource";
+import { SchedulesSpecificResourceSettings } from "./types";
 export declare const instantiateResource: InstantiateResource<SchedulesSpecificResourceSettings, SchedulesResource>;
 //# sourceMappingURL=instantiate-resource.d.ts.map

package/dist/instantiate-resource.js

@@ -6,7 +6,7 @@ const instantiateResource = (params) => {
     const { resourceConstructorParams } = params;
     const resource = new resource_1.SchedulesResource(resourceConstructorParams);
     const res = {
-        resource
+        resource,
     };
     return res;
 };

package/dist/resource.d.ts

@@ -1,7 +1,7 @@
-import { Resource } from '@ldsg/resource';
-import { ScheduleInfo } from '@ldsg/schedule';
-import { Agenda, Job } from 'agenda';
-import { CancelJobParams, ScheduleJobParams, SchedulesSpecificResourceSettings } from './types';
+import { Resource } from "@ldsg/resource";
+import { ScheduleInfo } from "@ldsg/schedule";
+import { Agenda, Job } from "agenda";
+import { CancelJobParams, ScheduleJobParams, SchedulesSpecificResourceSettings } from "./types";
 interface JobData {
     _static?: boolean;
     workflowResourceId: string;

package/dist/resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAmB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAEhG,UAAU,OAAO;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;AAED,UAAU,sBAAsB;IAC9B,gBAAgB,EAAE,YAAY,EAAE,CAAC;CAClC;AAED,KAAK,mBAAmB,GAAG,MAAM,sBAAsB,CAAC;AAIxD,qBAAa,iBAAkB,SAAQ,QAAQ,CAAC,iCAAiC,CAAC;IAChF,MAAM,EAAG,MAAM,CAAC;IAEhB,mBAAmB,EAAE,mBAAmB,CAsBtC;IAEF,eAAe,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAiBjD;IAEF,IAAI,sBAuDF;IAEF,WAAW,GAAU,QAAQ,iBAAiB,KAAG,OAAO,CAAC,GAAG,CAAC,CA8B3D;IAEF,SAAS,GAAU,QAAQ,eAAe,mBAOxC;IAEF,aAAa,sBAEX;CACH"}
+{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAmB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAEhG,UAAU,OAAO;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;AAED,UAAU,sBAAsB;IAC9B,gBAAgB,EAAE,YAAY,EAAE,CAAC;CAClC;AAED,KAAK,mBAAmB,GAAG,MAAM,sBAAsB,CAAC;AAIxD,qBAAa,iBAAkB,SAAQ,QAAQ,CAAC,iCAAiC,CAAC;IAChF,MAAM,EAAG,MAAM,CAAC;IAEhB,mBAAmB,EAAE,mBAAmB,CAsBtC;IAEF,eAAe,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAiBjD;IAEF,IAAI,sBAwDF;IAEF,WAAW,GAAU,QAAQ,iBAAiB,KAAG,OAAO,CAAC,GAAG,CAAC,CAsC3D;IAEF,SAAS,GAAU,QAAQ,eAAe,mBAOxC;IAEF,aAAa,sBAEX;CACH"}

package/dist/resource.js

@@ -8,30 +8,30 @@ const mongo_backend_1 = require("@agendajs/mongo-backend");
 const resource_1 = require("@ldsg/resource");
 const agenda_1 = require("agenda");
 const lodash_1 = __importDefault(require("lodash"));
-const JOB_NAME = 'executeWorkflow';
+const JOB_NAME = "executeWorkflow";
 class SchedulesResource extends resource_1.Resource {
     constructor() {
         super(...arguments);
         this.getScheduleInfoList = () => {
             const { id, getFilteredResources } = this;
             const { resources } = getFilteredResources({
-                parentId: id
+                parentId: id,
             });
             const mapRes = resources.map((resource) => {
                 var _a;
                 return (_a = resource.getScheduleInfo) === null || _a === void 0 ? void 0 : _a.call(resource);
             });
             const filterRes = lodash_1.default.filter(mapRes, (value) => !lodash_1.default.isUndefined(value));
-            const scheduleInfoList = lodash_1.default.map(filterRes, 'scheduleInfo');
+            const scheduleInfoList = lodash_1.default.map(filterRes, "scheduleInfo");
             const res = {
-                scheduleInfoList
+                scheduleInfoList,
             };
             return res;
         };
         this.executeWorkflow = async (params) => {
             const { workflowResourceId, workflowVariables } = params;
             const { resource: workflowResource } = this.getFilteredResource({
-                id: workflowResourceId
+                id: workflowResourceId,
             });
             const wr = workflowResource;
             if (!(wr === null || wr === void 0 ? void 0 : wr.execute)) {
@@ -39,33 +39,34 @@ class SchedulesResource extends resource_1.Resource {
             }
             await wr.execute({
                 context: {},
-                variables: workflowVariables || {}
+                variables: workflowVariables || {},
             });
         };
         this.init = async () => {
             var _a;
-            const { getFilteredResource, getResourcesFromSettings, settings: { processEvery } } = this;
-            const databaseResourceFromSettings = getResourcesFromSettings().databaseResource;
+            const { getFilteredResource, getResourcesFromSettings, settings: { processEvery }, } = this;
+            const databaseResourceFromSettings = getResourcesFromSettings()
+                .databaseResource;
             const databaseResource = databaseResourceFromSettings !== null && databaseResourceFromSettings !== void 0 ? databaseResourceFromSettings : getFilteredResource({
-                kind: 'database'
+                kind: "database",
             }).resource;
             const databaseInfo = (_a = databaseResource === null || databaseResource === void 0 ? void 0 : databaseResource.getDatabaseInfo) === null || _a === void 0 ? void 0 : _a.call(databaseResource);
             if (!(databaseInfo === null || databaseInfo === void 0 ? void 0 : databaseInfo.uri)) {
-                throw new Error('database uri not available');
+                throw new Error("database uri not available");
             }
             this.agenda = new agenda_1.Agenda({
-                backend: new mongo_backend_1.MongoBackend({ address: databaseInfo.uri }),
-                processEvery
+                backend: new mongo_backend_1.MongoBackend({ address: databaseInfo.uri, collection: "agenda_job" }),
+                processEvery,
             });
-            this.agenda.on('error', (error) => {
-                console.error('Agenda error:', error);
+            this.agenda.on("error", (error) => {
+                console.error("Agenda error:", error);
             });
             this.agenda.define(JOB_NAME, async (job) => {
                 await this.executeWorkflow(job.attrs.data);
             });
             await this.agenda.start();
             const { scheduleInfoList } = this.getScheduleInfoList();
-            const hasEvery = scheduleInfoList.some((info) => info.triggerType === 'every');
+            const hasEvery = scheduleInfoList.some((info) => info.triggerType === "every");
             if (hasEvery) {
                 await this.agenda.cancel({ name: JOB_NAME });
             }
@@ -77,21 +78,21 @@ class SchedulesResource extends resource_1.Resource {
                     triggerType: scheduleInfo.triggerType,
                     delay: scheduleInfo.delay,
                     scheduledAt: scheduleInfo.scheduledAt,
-                    cron: scheduleInfo.cron
+                    cron: scheduleInfo.cron,
                 });
             }
         };
         this.scheduleJob = async (params) => {
             if (!this.agenda) {
-                throw new Error('agenda not initialized');
+                throw new Error("agenda not initialized");
             }
-            const { workflowResourceId, workflowVariables, triggerType, delay, scheduledAt, cron, _static } = params;
+            const { workflowResourceId, workflowVariables, triggerType, delay, scheduledAt, cron, _static, } = params;
             const jobData = { _static, workflowResourceId, workflowVariables };
-            if (triggerType === 'now') {
+            if (triggerType === "now") {
                 return this.agenda.now(JOB_NAME, jobData);
             }
             const job = this.agenda.create(JOB_NAME, jobData);
-            if (triggerType === 'once') {
+            if (triggerType === "once") {
                 if (scheduledAt) {
                     job.schedule(new Date(scheduledAt));
                 }
@@ -99,20 +100,20 @@ class SchedulesResource extends resource_1.Resource {
                     job.schedule(new Date(Date.now() + delay));
                 }
                 else {
-                    throw new Error('invalid scheduling parameters: delay or scheduledAt required');
+                    throw new Error("invalid scheduling parameters: delay or scheduledAt required");
                 }
             }
-            else if (triggerType === 'every' && cron) {
+            else if (triggerType === "every" && cron) {
                 job.repeatEvery(cron);
             }
             else {
-                throw new Error('invalid scheduling parameters');
+                throw new Error("invalid scheduling parameters");
             }
             return job.save();
         };
         this.cancelJob = async (params) => {
             if (!this.agenda) {
-                throw new Error('agenda not initialized');
+                throw new Error("agenda not initialized");
             }
             const { jobId } = params;
             await this.agenda.cancel({ id: jobId });

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
-export * from './job-params';
-export * from './specific-resource-settings';
+export * from "./job-params";
+export * from "./specific-resource-settings";
 //# sourceMappingURL=index.d.ts.map

package/dist/types/job-params.d.ts

@@ -1,4 +1,4 @@
-import { TriggerType } from '@ldsg/schedule';
+import { TriggerType } from "@ldsg/schedule";
 export interface ScheduleJobParams {
     workflowResourceId: string;
     workflowVariables?: Record<string, unknown>;

package/dist/types/specific-resource-settings.d.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from "zod";
 export declare const SchedulesSpecificResourceSettingsSchema: z.ZodObject<{
     databaseResourceId: z.ZodOptional<z.ZodString>;
     processEvery: z.ZodOptional<z.ZodNumber>;

package/dist/types/specific-resource-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specific-resource-settings.d.ts","sourceRoot":"","sources":["../../src/types/specific-resource-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,uCAAuC;;;8BAMhC,CAAC;AAErB,eAAO,MAAM,8BAA8B;;;8BAA0C,CAAC;AACtF,MAAM,MAAM,iCAAiC,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uCAAuC,CAAC,CAAC"}
+{"version":3,"file":"specific-resource-settings.d.ts","sourceRoot":"","sources":["../../src/types/specific-resource-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,uCAAuC;;;8BAMhC,CAAC;AAErB,eAAO,MAAM,8BAA8B;;;8BAA0C,CAAC;AACtF,MAAM,MAAM,iCAAiC,GAAG,CAAC,CAAC,KAAK,CACrD,OAAO,uCAAuC,CAC/C,CAAC"}

package/dist/types/specific-resource-settings.js

@@ -6,7 +6,7 @@ exports.SchedulesSpecificResourceSettingsSchema = zod_1.z
     .object({
     databaseResourceId: zod_1.z.string().optional(),
     /** 轮询间隔(毫秒)，默认 1000 */
-    processEvery: zod_1.z.number().optional()
+    processEvery: zod_1.z.number().optional(),
 })
     .catchall(zod_1.z.any());
 exports.SpecificResourceSettingsSchema = exports.SchedulesSpecificResourceSettingsSchema;

package/package.json

@@ -1,43 +1,47 @@
 {
   "name": "@ldsg/schedules",
-  "version": "0.3.31",
+  "version": "0.3.33",
   "description": "",
   "keywords": [],
   "license": "MIT",
   "author": "wanxger",
-  "main": "dist/index.js",
-  "types": "dist",
   "files": [
     "dist/"
   ],
+  "main": "dist/index.js",
+  "types": "dist",
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
     "@agendajs/mongo-backend": "^4.0.2",
     "agenda": "^6.2.5",
     "lodash": "^4.17.21",
     "zod": "^4.1.11",
-    "@ldsg/database": "0.3.31",
-    "@ldsg/handler": "0.3.31",
-    "@ldsg/resource": "0.3.31",
-    "@ldsg/schedule": "0.3.31",
-    "@ldsg/resource-definition": "0.3.31"
+    "@ldsg/database": "0.3.33",
+    "@ldsg/resource": "0.3.33",
+    "@ldsg/handler": "0.3.33",
+    "@ldsg/resource-definition": "0.3.33",
+    "@ldsg/schedule": "0.3.33"
   },
   "devDependencies": {
     "@types/jest": "^29.5.2",
     "@types/lodash": "^4.14.202",
     "@types/node": "^20.13.0",
     "jest": "^29.5.0",
+    "oxfmt": "latest",
+    "oxlint": "latest",
     "ts-jest": "^29.1.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3",
-    "@ldsg/application": "0.3.31",
-    "@ldsg/types": "0.3.31"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@ldsg/application": "0.3.33",
+    "@ldsg/types": "0.3.33"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
     "clean": "rm -rf dist",
+    "format": "oxfmt --write src/",
+    "lint": "oxlint src/",
     "test": "jest"
   }
 }