@chevre/domain 22.7.0-alpha.5 → 22.7.0-alpha.7

package/example/src/chevre/findSetting.ts

@@ -25,7 +25,7 @@ async function main() {
 
     const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
 
-    const result = await settingRepo.findOne({}, ['quota']);
+    const result = await settingRepo.findOne({}, ['triggerWebhook', 'waiter']);
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });
 
@@ -53,11 +53,20 @@ async function main() {
         const updateResult = await settingRepo.updateByProject(
             { project: { id: { $eq: '*' } } },
             {
-                quota: {
-                    codeExpiresInSecondsDefault: 600,
-                    codeExpiresInSecondsMax: 8035200,
-                    placeOrderExpiresInSecondsMax: 3600,
-                    placeOrderExpiresInSecondsMin: 60
+                triggerWebhook: {
+                    timeout: 15000,
+                    useFetchAPI: true,
+                    secretKey: String(process.env.TRIGGER_WEBHOOK_SECRET_KEY),
+                    headerIdentifier: String(process.env.TRIGGER_WEBHOOK_HEADER_IDENTIFIER),
+                    retryCountMax: 2,
+                    retryIntervalInMS: 1000
+                },
+                waiter: {
+                    disabled: process.env.WAITER_DISABLED === '1',
+                    passportUnavailable: process.env.WAITER_PASSPORT_UNAVAILABLE === '1',
+                    passportIssuers: String(process.env.WAITER_PASSPORT_ISSUER)
+                        .split(' '),
+                    secret: String(process.env.WAITER_SECRET)
                 }
             }
         );

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -48,7 +48,7 @@ interface IQuotaSettings {
     placeOrderExpiresInSecondsMax?: number;
     placeOrderExpiresInSecondsMin?: number;
 }
-export interface ITriggerWebhookSettings {
+interface ITriggerWebhookSettings {
     /**
      * リクエストタイムアウト
      */
@@ -65,6 +65,12 @@ export interface ITriggerWebhookSettings {
     retryCountMax?: number;
     retryIntervalInMS?: number;
 }
+interface IWaiterSettings {
+    disabled?: boolean;
+    passportUnavailable?: boolean;
+    passportIssuers: string[];
+    secret: string;
+}
 export interface ISetting {
     defaultSenderEmail?: string;
     onEventChanged?: IOnEventChanged;
@@ -87,6 +93,7 @@ export interface ISetting {
     useInformResourceTypes?: string[];
     userPoolIdOld?: string;
     userPoolIdNew?: string;
+    waiter?: IWaiterSettings;
 }
 type IDocType = ISetting;
 type IModel = Model<IDocType>;

package/lib/chevre/repo/mongoose/schemas/setting.js

@@ -19,7 +19,8 @@ const schemaDefinition = {
     triggerWebhook: mongoose_1.SchemaTypes.Mixed,
     useInformResourceTypes: [String],
     userPoolIdOld: String,
-    userPoolIdNew: String
+    userPoolIdNew: String,
+    waiter: mongoose_1.SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repo/setting.d.ts

@@ -23,9 +23,9 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
-import { ISetting, ITriggerWebhookSettings } from './mongoose/schemas/setting';
+import { ISetting } from './mongoose/schemas/setting';
 type IKeyOfProjection = keyof ISetting;
-export { ISetting, ITriggerWebhookSettings };
+export { ISetting };
 /**
  * 設定リポジトリ
  */
@@ -46,5 +46,5 @@ export declare class SettingRepo {
                 $eq: string;
             };
         };
-    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter'>): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/setting.js

@@ -49,9 +49,9 @@ class SettingRepo {
     }
     updateByProject(filter, update) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { onEventChanged, onReservationStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook } = update;
+            const { onEventChanged, onReservationStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter } = update;
             return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
-                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined)
+                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined), (waiter !== undefined) ? { waiter } : undefined)
             })
                 .exec();
         });

package/lib/chevre/service/notification.d.ts

@@ -5,7 +5,7 @@ import type { ActionRepo } from '../repo/action';
 import type { MessageRepo } from '../repo/message';
 import type { ProjectRepo } from '../repo/project';
 import type { SettingRepo } from '../repo/setting';
-type ILineNotifyOperation<T> = (repos: {}, credentials: {
+type ILineNotifyOperation<T> = (repos: undefined, credentials: {
     lineNotify: LINENotifyCredentials;
 }) => Promise<T>;
 /**
@@ -30,9 +30,6 @@ declare function lineNotify({ subject, content, imageThumbnail, imageFullsize, l
     imageThumbnail?: string;
     imageFullsize?: string;
     logLevel: LineNotifyLogLevel;
-}, options: {
-    timeout: number;
-    useFetchAPI: boolean;
 }): ILineNotifyOperation<void>;
 declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook> & {
     project: {

package/lib/chevre/service/notification.js

@@ -122,9 +122,14 @@ function sendEmailMessage(params) {
 }
 exports.sendEmailMessage = sendEmailMessage;
 const MAX_LINE_NOTIFY_SUBJECT_LENGTH = 100;
-function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }, options) {
+function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }
+// options: {
+//     timeout: number;
+//     useFetchAPI: boolean;
+// }
+) {
     return (__, credentials) => __awaiter(this, void 0, void 0, function* () {
-        const { timeout, useFetchAPI } = options;
+        const timeout = 10000;
         const LINE_NOTIFY_URL = credentials.lineNotify.url;
         if (typeof LINE_NOTIFY_URL !== 'string') {
             throw new factory.errors.Internal('Environment variable LINE_NOTIFY_URL not set');
@@ -149,41 +154,36 @@ function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel
         const message = util.format('\n%s\n%s\n%s\n%s\n%s\n\n%s', `[${logLevel}] ${shortSubject}`, `now:${(new Date()).toISOString()}`, `pid:${process.pid}`, `GAE_APPLICATION:${process.env.GAE_APPLICATION}`, 
         // `GAE_INSTANCE:${process.env.GAE_INSTANCE}`,
         `GAE_SERVICE:${process.env.GAE_SERVICE}`, content);
-        if (useFetchAPI) {
+        try {
+            const form = new FormData();
+            form.set('message', message);
+            if (typeof imageThumbnail === 'string') {
+                form.set('imageThumbnail', imageThumbnail);
+            }
+            if (typeof imageFullsize === 'string') {
+                form.set('imageFullsize', imageFullsize);
+            }
+            const res = yield fetch(LINE_NOTIFY_URL, Object.assign({ method: 'POST', headers: {
+                    Authorization: `Bearer ${accessToken}`
+                }, body: form }, (typeof timeout === 'number')
+                ? { signal: AbortSignal.timeout(timeout) }
+                : undefined));
+            let body;
             try {
-                const form = new FormData();
-                form.set('message', message);
-                if (typeof imageThumbnail === 'string') {
-                    form.set('imageThumbnail', imageThumbnail);
-                }
-                if (typeof imageFullsize === 'string') {
-                    form.set('imageFullsize', imageFullsize);
-                }
-                const res = yield fetch(LINE_NOTIFY_URL, Object.assign({ method: 'POST', headers: {
-                        Authorization: `Bearer ${accessToken}`
-                    }, body: form }, (typeof timeout === 'number')
-                    ? { signal: AbortSignal.timeout(timeout) }
-                    : undefined));
-                let body;
-                try {
-                    body = yield res.json();
-                }
-                catch (error) {
-                    // no op
-                }
-                switch (res.status) {
-                    case http_status_1.OK:
-                        break;
-                    default:
-                        throw new factory.errors.Internal(`${res.status} ${body === null || body === void 0 ? void 0 : body.message}`);
-                }
+                body = yield res.json();
+            }
+            catch (error) {
+                // no op
             }
-            catch (err) {
-                throw err;
+            switch (res.status) {
+                case http_status_1.OK:
+                    break;
+                default:
+                    throw new factory.errors.Internal(`${res.status} ${body === null || body === void 0 ? void 0 : body.message}`);
             }
         }
-        else {
-            throw new factory.errors.NotImplemented('only useFetchAPI implemented');
+        catch (err) {
+            throw err;
         }
     });
 }

package/lib/chevre/service/task.js

@@ -152,13 +152,6 @@ let notification;
  */
 function abort(params) {
     return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
-        const timeout = (_a = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _a === void 0 ? void 0 : _a.timeout;
-        const useFetchAPI = ((_b = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _b === void 0 ? void 0 : _b.useFetchAPI) === true;
-        if (typeof timeout !== 'number') {
-            throw new factory.errors.NotFound('setting.triggerWebhook.timeout');
-        }
         const { abortedTasksWithoutReport } = settings;
         const abortedTask = yield repos.task.abortOne(params);
         // tslint:disable-next-line:no-single-line-block-comment
@@ -179,20 +172,15 @@ function abort(params) {
             yield notification.lineNotify({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'
-            }, { timeout, useFetchAPI })({}, credentials);
+            }
+            // { timeout, useFetchAPI }
+            )(undefined, credentials);
         }
     });
 }
 exports.abort = abort;
 function notifyAbortedTasks(params) {
     return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
-        const timeout = (_a = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _a === void 0 ? void 0 : _a.timeout;
-        const useFetchAPI = ((_b = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _b === void 0 ? void 0 : _b.useFetchAPI) === true;
-        if (typeof timeout !== 'number') {
-            throw new factory.errors.NotFound('setting.triggerWebhook.timeout');
-        }
         const { abortedTasksWithoutReport } = settings;
         const abortedTasks = yield repos.task.projectFields(Object.assign({ statuses: [factory.taskStatus.Aborted], dateAborted: { $gte: params.dateAbortedGte } }, (abortedTasksWithoutReport.length > 0)
             ? { name: { $nin: abortedTasksWithoutReport } }
@@ -206,7 +194,9 @@ function notifyAbortedTasks(params) {
             yield notification.lineNotify({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'
-            }, { timeout, useFetchAPI })({}, credentials);
+            }
+            // { timeout, useFetchAPI }
+            )(undefined, credentials);
         }
     });
 }

package/package.json

@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.5"
+  "version": "22.7.0-alpha.7"
 }