pg-mvc-service 2.1.5 → 2.1.6
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/dist/Service.d.ts +17 -1
- package/dist/Service.d.ts.map +1 -1
- package/dist/Service.js +21 -13
- package/package.json +1 -1
package/dist/Service.d.ts
CHANGED
|
@@ -14,7 +14,22 @@ export interface IError {
|
|
|
14
14
|
code: string;
|
|
15
15
|
description: string;
|
|
16
16
|
}
|
|
17
|
-
|
|
17
|
+
interface IServiceEnv {
|
|
18
|
+
DB_USER?: string;
|
|
19
|
+
DB_HOST?: string;
|
|
20
|
+
DB_DATABASE?: string;
|
|
21
|
+
DB_PASSWORD?: string;
|
|
22
|
+
DB_PORT?: string | number;
|
|
23
|
+
DB_IS_SSL?: string;
|
|
24
|
+
TZ?: string;
|
|
25
|
+
S3_BUCKET_NAME?: string;
|
|
26
|
+
S3_REGION?: string;
|
|
27
|
+
S3_ACCESS_KEY_ID?: string;
|
|
28
|
+
S3_SECRET_ACCESS_KEY?: string;
|
|
29
|
+
SECRET_KEY_HEX?: string;
|
|
30
|
+
HMAC_KEY_BASE64?: string;
|
|
31
|
+
}
|
|
32
|
+
export declare class Service<IEnv extends IServiceEnv = IServiceEnv> {
|
|
18
33
|
protected readonly method: MethodType;
|
|
19
34
|
get Method(): MethodType;
|
|
20
35
|
protected readonly endpoint: string;
|
|
@@ -41,6 +56,7 @@ export declare class Service {
|
|
|
41
56
|
private readonly c?;
|
|
42
57
|
protected get C(): Context;
|
|
43
58
|
get Module(): 'express' | 'hono';
|
|
59
|
+
get Env(): IEnv;
|
|
44
60
|
constructor(request: Request, response: Response);
|
|
45
61
|
constructor(c: Context);
|
|
46
62
|
inintialize(): Promise<void>;
|
package/dist/Service.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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,aAAa,EAAE,MAAM,MAAM,CAAA;AACnD,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;
|
|
1
|
+
{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../src/Service.ts"],"names":[],"mappings":"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"}
|
package/dist/Service.js
CHANGED
|
@@ -68,6 +68,14 @@ class Service {
|
|
|
68
68
|
throw new Error('Failed to determine whether the module is "express" or "hono".');
|
|
69
69
|
}
|
|
70
70
|
;
|
|
71
|
+
get Env() {
|
|
72
|
+
if (this.Module === 'express') {
|
|
73
|
+
return process.env;
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
return this.C.env;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
71
79
|
constructor(param1, param2) {
|
|
72
80
|
this.method = 'GET';
|
|
73
81
|
this.endpoint = '';
|
|
@@ -78,12 +86,12 @@ class Service {
|
|
|
78
86
|
this.response = new ResponseType_1.ResponseType();
|
|
79
87
|
this.tags = [];
|
|
80
88
|
this.errorList = [];
|
|
81
|
-
this.dbUser =
|
|
82
|
-
this.dbHost =
|
|
83
|
-
this.dbName =
|
|
84
|
-
this.dbPassword =
|
|
85
|
-
this.dbPort =
|
|
86
|
-
this.dbIsSslConnect =
|
|
89
|
+
this.dbUser = this.Env.DB_USER;
|
|
90
|
+
this.dbHost = this.Env.DB_HOST;
|
|
91
|
+
this.dbName = this.Env.DB_DATABASE;
|
|
92
|
+
this.dbPassword = this.Env.DB_PASSWORD;
|
|
93
|
+
this.dbPort = this.Env.DB_PORT;
|
|
94
|
+
this.dbIsSslConnect = this.Env.DB_IS_SSL === 'true';
|
|
87
95
|
this.isExecuteRollback = false;
|
|
88
96
|
if (param2 !== undefined) {
|
|
89
97
|
// Express の場合: (request, response)
|
|
@@ -250,7 +258,7 @@ class Service {
|
|
|
250
258
|
var _a;
|
|
251
259
|
if (this.pool === undefined) {
|
|
252
260
|
this.pool = this.setPool();
|
|
253
|
-
this.pool.query(`SET TIME ZONE '${(_a =
|
|
261
|
+
this.pool.query(`SET TIME ZONE '${(_a = this.Env.TZ) !== null && _a !== void 0 ? _a : 'Asia/Tokyo'}';`);
|
|
254
262
|
}
|
|
255
263
|
return this.pool;
|
|
256
264
|
}
|
|
@@ -292,10 +300,10 @@ class Service {
|
|
|
292
300
|
get S3Client() {
|
|
293
301
|
if (this.s3Client === undefined) {
|
|
294
302
|
this.s3Client = new AwsS3Client_1.AwsS3Client({
|
|
295
|
-
bucketName:
|
|
296
|
-
region:
|
|
297
|
-
accessKeyId:
|
|
298
|
-
secretAccessKey:
|
|
303
|
+
bucketName: this.Env.S3_BUCKET_NAME,
|
|
304
|
+
region: this.Env.S3_REGION,
|
|
305
|
+
accessKeyId: this.Env.S3_ACCESS_KEY_ID,
|
|
306
|
+
secretAccessKey: this.Env.S3_SECRET_ACCESS_KEY
|
|
299
307
|
});
|
|
300
308
|
}
|
|
301
309
|
return this.s3Client;
|
|
@@ -309,8 +317,8 @@ class Service {
|
|
|
309
317
|
get EncryptClient() {
|
|
310
318
|
if (this.encryptClient === undefined) {
|
|
311
319
|
this.encryptClient = new EncryptClient_1.EncryptClient({
|
|
312
|
-
secretKeyHex:
|
|
313
|
-
hmacKeyBase64:
|
|
320
|
+
secretKeyHex: this.Env.SECRET_KEY_HEX,
|
|
321
|
+
hmacKeyBase64: this.Env.HMAC_KEY_BASE64
|
|
314
322
|
});
|
|
315
323
|
}
|
|
316
324
|
return this.encryptClient;
|