fix: agent not work

packages/midway-schedule/lib/schedule.ts

@@ -2,6 +2,7 @@
 
 import loadSchedule from './load_schedule';
 const BaseSchedule = require('egg-schedule/lib/schedule');
+const loadEggSchedule = require('egg-schedule/lib/load_schedule');
 
 const M_STRATEGY: string = Symbol('strategy') as any;
 const M_STRATEGY_INSTANCE: string = Symbol('strategy_instance') as any;
@@ -28,7 +29,8 @@ module.exports = class Schedule extends BaseSchedule {
   }
 
   loadSchedule() {
-    const scheduleItems = loadSchedule(this.agent);
+    const scheduleItems = loadEggSchedule(this.agent);
+    loadSchedule(this.agent);
 
     for (const k of Object.keys(scheduleItems)) {
       const { key, schedule } = scheduleItems[k];

packages/midway-schedule/test/fixtures/worker-egg-schedule/app/schedule/hello.js

@@ -0,0 +1,11 @@
+let i = 1;
+
+exports.task = async (ctx) => {
+  console.log('hasdf');
+  ctx.logger.info(process.pid, 'hehehehe', i++);
+};
+
+exports.schedule = {
+  type: 'worker',
+  interval: 1000,
+};

packages/midway-schedule/test/fixtures/worker-egg-schedule/config/plugin.ts

@@ -0,0 +1,3 @@
+'use strict';
+
+exports.logrotator = true;

packages/midway-schedule/test/fixtures/worker-egg-schedule/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "worker-egg-schedule"
+}

packages/midway-schedule/test/fixtures/worker/src/lib/schedule/interval.ts

@@ -8,6 +8,6 @@ import { schedule } from '../../../../../../../midway';
 })
 export default class IntervalCron {
   async exec(ctx) {
-    ctx.logger.info(process.pid, 'interval');
+    ctx.logger.info(process.pid, 'hello decorator');
   }
 }

packages/midway-schedule/test/schedule.test.ts

@@ -38,7 +38,19 @@ describe('test/schedule.test.ts', () => {
       assert.deepEqual(item.schedule, { type: 'worker', interval: 1000 });
     });
 
-    it('should support interval with @schedule decorator', async () => {
+    it('should support exec app/schedule/*.js (for egg)', async () => {
+      const name = 'worker-egg-schedule';
+      application = cluster(name, {
+        typescript: false,
+        worker: 2,
+      });
+      await application.ready();
+      await sleep(5000);
+      const log = getLogContent(name);
+      assert(contains(log, 'hehehehe') === 4, '未正确执行 4 次');
+    });
+
+    it('should support interval with @schedule decorator (both app/schedule & lib/schedule)', async () => {
       const name = 'worker';
       application = cluster(name, {
         typescript: true,
@@ -47,7 +59,7 @@ describe('test/schedule.test.ts', () => {
       await application.ready();
       await sleep(5000);
       const log = getLogContent(name);
-      assert(contains(log, 'interval') === 4, '未正确执行 4 次');
+      assert(contains(log, 'hello decorator') === 4, '未正确执行 4 次');
     });
   });
 });