@zenweb/schedule 4.0.1 → 5.1.0

package/dist/index.js

@@ -7,6 +7,7 @@ export default function setup(opt) {
     const option = Object.assign({
         paths: ['./app/schedule'],
         disabled: process.env.ZENWEB_SCHEDULE_DISABLED === '1',
+        prefix: '/__schedule/',
     }, opt);
     return async function schedule(setup) {
         setup.assertModuleExists('inject', '@zenweb/inject');
@@ -15,17 +16,20 @@ export default function setup(opt) {
         const scheduleRegister = new ScheduleRegister(setup.core, option);
         setup.defineCoreProperty('scheduleRegister', { value: scheduleRegister });
         if (option.paths && option.paths.length) {
-            for (let d of option.paths) {
-                if (d.startsWith('./')) {
-                    d = path.join(process.cwd(), d.slice(2));
+            for (let dir of option.paths) {
+                if (dir.startsWith('./')) {
+                    dir = path.join(process.cwd(), dir.slice(2));
                 }
-                for (const file of await globby(option.patterns || '**/*.{ts,js}', { cwd: d, absolute: true })) {
+                for (const file of await globby(option.patterns || '**/*.{ts,js}', { cwd: dir })) {
                     setup.debug('load:', file);
-                    const importUrl = pathToFileURL(file).href;
+                    const lastDot = Math.max(0, file.lastIndexOf('.'));
+                    const filename = lastDot ? file.slice(0, lastDot) : file;
+                    const prefix = filename.split('/').join('/');
+                    const importUrl = pathToFileURL(path.join(dir, file)).href;
                     const mod = await import(importUrl);
                     for (const i of Object.values(mod)) {
                         if (typeof i === 'function') {
-                            scheduleRegister.register(i);
+                            scheduleRegister.register(i, prefix);
                         }
                     }
                 }

package/dist/register.d.ts

@@ -18,7 +18,7 @@ export declare class ScheduleRegister {
     /**
      * 添加定时任务到路由并启动定时器
      */
-    register(target: any): void;
+    register(target: any, prefix?: string): void;
     addToCoreRouter(): void;
     destory(): void;
 }

package/dist/register.js

@@ -1,7 +1,7 @@
 /// <reference types="@zenweb/inject" />
+import path from 'node:path';
 import { ServerResponse } from 'node:http';
 import { scheduleJob } from 'node-schedule';
-import { randomUUID } from 'node:crypto';
 import { makeMethodDecorator } from 'decorator-make';
 import { Router } from '@zenweb/router';
 const scheduleDecorator = makeMethodDecorator();
@@ -10,7 +10,7 @@ const scheduleDecorator = makeMethodDecorator();
  */
 export function schedule(opt) {
     return scheduleDecorator.wrap((descriptor, target) => {
-        const path = `${randomUUID()}/${target.constructor.name}.${descriptor.handle.name}`;
+        const path = `/${target.constructor.name}.${descriptor.handle.name}`;
         return Object.assign({ path }, descriptor, opt);
     });
 }
@@ -22,19 +22,20 @@ export class ScheduleRegister {
     constructor(core, option) {
         this.core = core;
         this.router = new Router({
-            prefix: '/__schedule/',
+            prefix: option.prefix,
         });
         this.option = option;
     }
     /**
      * 添加定时任务到路由并启动定时器
      */
-    register(target) {
+    register(target, prefix) {
         const methods = scheduleDecorator.getMethods(target.prototype);
         if (methods.length > 0) {
             for (const item of methods) {
+                const apath = prefix ? path.join('/', prefix, item.path) : item.path;
                 // 添加到路由中
-                this.router.post(item.path, ...(item.middleware ?
+                this.router.post(apath, ...(item.middleware ?
                     (Array.isArray(item.middleware) ? item.middleware : [item.middleware]) : []), async (ctx) => {
                     const cls = await ctx.injector.getInstance(target);
                     await ctx.injector.apply(cls, item);
@@ -44,7 +45,7 @@ export class ScheduleRegister {
                 }
                 // 启用定时器
                 const job = scheduleJob(item.rule, () => {
-                    const path = '/__schedule/' + item.path;
+                    const url = this.option.prefix ? path.join(this.option.prefix, apath) : apath;
                     const request = Object.assign({
                         headers: {
                             host: '127.0.0.1',
@@ -56,8 +57,8 @@ export class ScheduleRegister {
                         protocol: 'http',
                         secure: 'false',
                         method: 'POST',
-                        url: path,
-                        path,
+                        url,
+                        path: url,
                         socket: {
                             remoteAddress: '127.0.0.1',
                             remotePort: 7001,
@@ -71,7 +72,7 @@ export class ScheduleRegister {
         }
     }
     addToCoreRouter() {
-        this.core.router.use(this.router.routes());
+        this.core.router.add(this.router);
     }
     destory() {
         for (const job of this.jobs) {

package/dist/types.d.ts

@@ -18,4 +18,10 @@ export interface ScheduleOption {
      * @default false
      */
     disabled?: boolean;
+    /**
+     * 路径前缀
+     *
+     * @default '/__schedule/'
+     */
+    prefix?: string;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zenweb/schedule",
   "type": "module",
-  "version": "4.0.1",
+  "version": "5.1.0",
   "description": "Zenweb Schedule module",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -35,18 +35,18 @@
     "url": "https://github.com/yefei/zenweb-schedule/issues"
   },
   "devDependencies": {
-    "@types/node": "^22.7.5",
-    "@zenweb/core": "^5.1.0",
+    "@types/node": "^22.19.15",
+    "@zenweb/core": "^5.2.1",
     "@zenweb/inject": "^5.1.0",
-    "@zenweb/router": "^5.0.0",
-    "rimraf": "^4.3.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.6.3"
+    "@zenweb/router": "^6.0.3",
+    "rimraf": "^4.4.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@types/node-schedule": "^2.1.7",
+    "@types/node-schedule": "^2.1.8",
     "decorator-make": "^1.5.0",
-    "globby": "^14.0.2",
+    "globby": "^14.1.0",
     "node-schedule": "^2.1.1"
   }
 }