@clairejs/server 3.22.5 → 3.22.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md
CHANGED
|
@@ -44,8 +44,11 @@ export class AbstractJobScheduler {
|
|
|
44
44
|
const tx = await this.db.createTransaction();
|
|
45
45
|
try {
|
|
46
46
|
const newJob = await jobHandler.handlerFn({ ...job }, tx);
|
|
47
|
+
console.log("after handler new job?", newJob);
|
|
48
|
+
console.log("check job at", job, job.at);
|
|
47
49
|
if (job.at) {
|
|
48
50
|
if (!newJob) {
|
|
51
|
+
console.log("remove job", job.id);
|
|
49
52
|
await this.removeJob(job.id);
|
|
50
53
|
this.logger.info(`Remove one-time job ${job.jobName} at timestamp ${job.at}`);
|
|
51
54
|
}
|
|
@@ -53,9 +56,12 @@ export class AbstractJobScheduler {
|
|
|
53
56
|
await this.afterJob(newJob, tx);
|
|
54
57
|
}
|
|
55
58
|
}
|
|
59
|
+
this.logger.debug("Job tx commiting");
|
|
56
60
|
await tx.commit();
|
|
61
|
+
this.logger.debug("Job tx committed");
|
|
57
62
|
}
|
|
58
63
|
catch (err) {
|
|
64
|
+
this.logger.error("Error handling job", err);
|
|
59
65
|
await tx.rollback();
|
|
60
66
|
}
|
|
61
67
|
return;
|
|
@@ -33,7 +33,6 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
|
|
|
33
33
|
}
|
|
34
34
|
async handleCron(jobInfo) {
|
|
35
35
|
this.logger.debug(`Handle cron`, jobInfo);
|
|
36
|
-
console.log("handling cron", JSON.stringify(jobInfo));
|
|
37
36
|
await this.executeJob(jobInfo);
|
|
38
37
|
}
|
|
39
38
|
async afterJob(_job, _tx) {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { getServiceProvider, HttpMethod, SocketMethod, Errors } from "@clairejs/core";
|
|
2
2
|
import { AbstractHttpRequestHandler } from "../http/controller/AbstractHttpRequestHandler";
|
|
3
|
-
import { AwsJobScheduler } from "../job/AwsJobScheduler";
|
|
4
|
-
import { CRON_REQUEST_METHOD } from "../job/interfaces";
|
|
5
3
|
import { AbstractServerSocketManager } from "../socket/AbstractServerSocketManager";
|
|
4
|
+
import { CRON_REQUEST_METHOD } from "../job/interfaces";
|
|
5
|
+
import { AbstractJobScheduler } from "../job/AbstractJobScheduler";
|
|
6
6
|
const convertCorsToHeaders = (origin, cors) => {
|
|
7
7
|
const headers = {};
|
|
8
8
|
if (cors?.credentials) {
|
|
@@ -78,22 +78,20 @@ export class LambdaWrapper {
|
|
|
78
78
|
}
|
|
79
79
|
async bootServer() {
|
|
80
80
|
if (!this._server) {
|
|
81
|
-
const injector = getServiceProvider().getInjector();
|
|
82
81
|
this._server = await this.serverFactory();
|
|
82
|
+
const injector = getServiceProvider().getInjector();
|
|
83
83
|
this.socketManager = injector.resolveOptional(AbstractServerSocketManager);
|
|
84
84
|
this.httpRequestHandler = injector.resolveOptional(AbstractHttpRequestHandler);
|
|
85
|
-
this.jobScheduler = injector.resolveOptional(
|
|
85
|
+
this.jobScheduler = injector.resolveOptional(AbstractJobScheduler);
|
|
86
86
|
await injector.initInstances();
|
|
87
87
|
this.socketManager?.configure();
|
|
88
88
|
await this._server.init();
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
async handler(event) {
|
|
92
|
-
console.log("lambda wrapper handler");
|
|
93
92
|
await this.bootServer();
|
|
94
93
|
//-- handle http otherwise
|
|
95
94
|
const requestOptions = this.requestMapper(event);
|
|
96
|
-
console.log("request optons", JSON.stringify(requestOptions));
|
|
97
95
|
if (!requestOptions) {
|
|
98
96
|
throw Errors.SYSTEM_ERROR("Cannot resolve event");
|
|
99
97
|
}
|
|
@@ -102,7 +100,6 @@ export class LambdaWrapper {
|
|
|
102
100
|
return toApiGatewayFormat({ code: 200, headers: corsHeaders, cookies: {} });
|
|
103
101
|
}
|
|
104
102
|
if (requestOptions.method === CRON_REQUEST_METHOD) {
|
|
105
|
-
console.log("request handle cron", !!this.jobScheduler);
|
|
106
103
|
await this.jobScheduler?.handleCron(requestOptions.body);
|
|
107
104
|
return toApiGatewayFormat({ code: 200, headers: corsHeaders, cookies: {} });
|
|
108
105
|
}
|