pg-mvc-service 2.1.2 → 2.1.4

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.
Files changed (5) hide show
  1. package/dist/Service.d.ts +2 -2
  2. package/dist/Service.d.ts.map +1 -1
  3. package/dist/Service.js +12 -10
  4. package/dist/cron/CronExecuter.js +29 -66
  5. package/package.json +1 -1
package/dist/Service.d.ts CHANGED
@@ -51,9 +51,9 @@ export declare class Service {
51
51
  private setPool;
52
52
  protected checkMaintenance(): Promise<void>;
53
53
  protected middleware(): Promise<void>;
54
- resSuccess(): void;
54
+ resSuccess(): Context | undefined;
55
55
  protected outputErrorLog(ex: any): Promise<void>;
56
- handleException(ex: any): void;
56
+ handleException(ex: any): Context | undefined;
57
57
  private pool?;
58
58
  protected get Pool(): Pool;
59
59
  private client?;
package/dist/Service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../src/Service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../src/Service.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAQ,OAAO,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,EAAE,IAAI,EAAE,KAAK,UAAU,EAAE,MAAM,IAAI,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,KAAK,WAAW,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAE7E,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AACrE,MAAM,WAAW,MAAM;IACnB,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,OAAO;IAChB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAa;IAC1D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAS;IAC9C,IAAI,MAAM,IAAI,UAAU,CAAwB;IAChD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAM;IACzC,IAAI,QAAQ,IAAI,MAAM,CAAmD;IACzE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAM;IACxC,IAAI,OAAO,IAAI,MAAM,CAAyB;IAC9C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAM;IACxC,IAAI,OAAO,IAAI,MAAM,CAA+E;IACpG,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAM;IACjD,IAAI,gBAAgB,IAAI,MAAM,CAAkC;IAChE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAqB;IAC5D,IAAI,OAAO,IAAI,WAAW,CAAwB;IAClD,IAAI,SAAS,IAAI,MAAM,CAA6C;IACpE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAsB;IAC/D,IAAI,QAAQ,IAAI,YAAY,CAAyB;IACrD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IAC5C,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,CAAsB;IAC/C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;IACjD,IAAI,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,CAM7B;IAED,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACjC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;IAC/B,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG;gBAQxC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;gBACpC,CAAC,EAAE,OAAO;IAcT,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAWzC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAuB;IAChD,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAuB;IAChD,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAA2B;IACpD,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAA2B;IACxD,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAuB;IACzD,SAAS,CAAC,cAAc,EAAE,OAAO,CAAoC;IACrE,OAAO,CAAC,OAAO;cAuBC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;cACjC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAEpC,UAAU,IAAI,OAAO,GAAG,SAAS;cASxB,cAAc,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAC/C,eAAe,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,GAAG,SAAS;IAkDpD,OAAO,CAAC,IAAI,CAAC,CAAO;IACpB,SAAS,KAAK,IAAI,IAAI,IAAI,CAMzB;IACD,OAAO,CAAC,MAAM,CAAC,CAAa;IAC5B,OAAO,CAAC,iBAAiB,CAAkB;IAC3C,SAAS,KAAK,MAAM,IAAI,UAAU,CAKjC;IAEY,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAM7B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAOzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOrC,OAAO,CAAC,QAAQ,CAAC,CAAc;IAC/B,IAAI,QAAQ,IAAI,WAAW,CAU1B;IAED,OAAO,CAAC,YAAY,CAAC,CAAgB;IACrC,IAAI,YAAY,IAAI,YAAY,CAK/B;IAED,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,IAAI,aAAa,IAAI,aAAa,CASjC;IAEY,UAAU,CAAC,QAAQ,GAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,SAAS,GAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAChF,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CA0C1H"}
package/dist/Service.js CHANGED
@@ -122,6 +122,10 @@ class Service {
122
122
  }
123
123
  resSuccess() {
124
124
  this.setResponse(200, this.response.ResponseData);
125
+ if (this.module === 'hono') {
126
+ return this.c;
127
+ }
128
+ return;
125
129
  }
126
130
  outputErrorLog(ex) {
127
131
  return __awaiter(this, void 0, void 0, function* () { });
@@ -135,51 +139,49 @@ class Service {
135
139
  this.setResponse(401, {
136
140
  message: "Authentication expired. Please login again."
137
141
  });
138
- return;
139
142
  }
140
143
  else if (ex instanceof Exception_1.ForbiddenException) {
141
144
  this.setResponse(403, {
142
145
  message: 'Forbidden error'
143
146
  });
144
- return;
145
147
  }
146
148
  else if (ex instanceof Exception_1.InputErrorException) {
147
149
  this.setResponse(400, {
148
150
  errorCode: `${this.apiCode}-${ex.ErrorId}`,
149
151
  errorMessage: ex.message
150
152
  });
151
- return;
152
153
  }
153
154
  else if (ex instanceof Exception_1.DbConflictException) {
154
155
  this.setResponse(409, {
155
156
  errorCode: `${this.apiCode}-${ex.ErrorId}`,
156
157
  errorMessage: ex.message
157
158
  });
158
- return;
159
159
  }
160
160
  else if (ex instanceof Exception_1.UnprocessableException) {
161
161
  this.setResponse(422, {
162
162
  errorCode: `${this.apiCode}-${ex.ErrorId}`,
163
163
  errorMessage: ex.message
164
164
  });
165
- return;
166
165
  }
167
166
  else if (ex instanceof Exception_1.MaintenanceException) {
168
167
  this.setResponse(503, {
169
168
  errorMessage: ex.message
170
169
  });
171
- return;
172
170
  }
173
171
  else if (ex instanceof Exception_1.NotFoundException) {
174
172
  this.setResponse(404, {
175
173
  errorCode: `${this.apiCode}-${ex.ErrorId}`,
176
174
  errorMessage: ex.message
177
175
  });
178
- return;
179
176
  }
180
- this.setResponse(500, {
181
- message: 'Internal server error'
182
- });
177
+ else {
178
+ this.setResponse(500, {
179
+ message: 'Internal server error'
180
+ });
181
+ }
182
+ if (this.module === 'hono') {
183
+ return this.c;
184
+ }
183
185
  return;
184
186
  }
185
187
  get Pool() {
package/dist/cron/CronExecuter.js CHANGED
@@ -1,37 +1,8 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || (function () {
19
- var ownKeys = function(o) {
20
- ownKeys = Object.getOwnPropertyNames || function (o) {
21
- var ar = [];
22
- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
- return ar;
24
- };
25
- return ownKeys(o);
26
- };
27
- return function (mod) {
28
- if (mod && mod.__esModule) return mod;
29
- var result = {};
30
- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
- __setModuleDefault(result, mod);
32
- return result;
33
- };
34
- })();
2
+ // const cron = require('node-cron');
3
+ // import fs from 'fs';
4
+ // import path from 'path';
5
+ // import { BaseCron } from "./BaseCron";
35
6
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
36
7
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
37
8
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -41,41 +12,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
41
12
  step((generator = generator.apply(thisArg, _arguments || [])).next());
42
13
  });
43
14
  };
44
- var __importDefault = (this && this.__importDefault) || function (mod) {
45
- return (mod && mod.__esModule) ? mod : { "default": mod };
46
- };
47
15
  Object.defineProperty(exports, "__esModule", { value: true });
48
16
  exports.runCron = void 0;
49
- const cron = require('node-cron');
50
- const fs_1 = __importDefault(require("fs"));
51
- const path_1 = __importDefault(require("path"));
52
17
  const runCron = (dir, logCallback) => __awaiter(void 0, void 0, void 0, function* () {
53
- const files = fs_1.default.readdirSync(dir);
54
- for (let file of files) {
55
- if (['BaseCron.ts'].includes(file)) {
56
- continue;
57
- }
58
- const filePath = path_1.default.join(dir, file);
59
- const module = yield Promise.resolve(`${filePath}`).then(s => __importStar(require(s)));
60
- const cronClass = module.default;
61
- const cronInstance = new cronClass();
62
- cron.schedule(cronInstance.CronSchedule, () => __awaiter(void 0, void 0, void 0, function* () {
63
- try {
64
- yield cronInstance.setUp();
65
- yield cronInstance.run();
66
- }
67
- catch (ex) {
68
- if (logCallback !== undefined && ex instanceof Error) {
69
- yield logCallback(ex).
70
- catch(() => {
71
- // ログ送信時にエラーになっても握りつぶす
72
- });
73
- }
74
- }
75
- finally {
76
- yield cronInstance.tearDown();
77
- }
78
- }));
79
- }
18
+ // const files = fs.readdirSync(dir);
19
+ // for (let file of files) {
20
+ // if (['BaseCron.ts'].includes(file)) {
21
+ // continue;
22
+ // }
23
+ // const filePath = path.join(dir, file);
24
+ // const module = await import(filePath);
25
+ // const cronClass = module.default;
26
+ // const cronInstance: BaseCron = new cronClass();
27
+ // cron.schedule(cronInstance.CronSchedule, async () => {
28
+ // try {
29
+ // await cronInstance.setUp();
30
+ // await cronInstance.run();
31
+ // } catch (ex: unknown) {
32
+ // if (logCallback !== undefined && ex instanceof Error) {
33
+ // await logCallback(ex).
34
+ // catch(() => {
35
+ // // ログ送信時にエラーになっても握りつぶす
36
+ // });
37
+ // }
38
+ // } finally {
39
+ // await cronInstance.tearDown();
40
+ // }
41
+ // });
42
+ // }
80
43
  });
81
44
  exports.runCron = runCron;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pg-mvc-service",
3
- "version": "2.1.2",
3
+ "version": "2.1.4",
4
4
  "description": "",
5
5
  "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
6
6
  "bugs": {