@chevre/domain 21.32.0-alpha.6 → 21.32.0-alpha.8

package/example/src/chevre/report2developers.ts

@@ -3,32 +3,35 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
-const project = { id: String(process.env.PROJECT_ID) };
+// const project = { id: String(process.env.PROJECT_ID) };
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const notificationService = await chevre.service.notification.createService();
 
-    // await notificationService.report2developers(
-    //     'xxx',
-    //     'xxx'
-    // )({ accessToken: String(process.env.LINE_NOTIFY_ACCESS_TOKEN) });
-
-    await notificationService.triggerWebhook({
-        typeOf: chevre.factory.actionType.InformAction,
-        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-        agent: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-        recipient: {
-            id: 'xxx',
-            url: 'https://example.com',
-            typeOf: chevre.factory.creativeWorkType.WebApplication
-        },
-        object: { sample: 'sample' }
+    await notificationService.lineNotify({
+        subject: 'sample notification',
+        content: 'sample conent\nsample conent\nsample conent\nsample conent\nsample conent\nsample conent\nsample conent',
+        logLevel: 'log'
     })({
-        action: await chevre.repository.Action.createInstance(mongoose.connection),
         useFetchAPI: true
     });
+
+    // await notificationService.triggerWebhook({
+    //     typeOf: chevre.factory.actionType.InformAction,
+    //     project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+    //     agent: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+    //     recipient: {
+    //         id: 'xxx',
+    //         url: 'https://example.com',
+    //         typeOf: chevre.factory.creativeWorkType.WebApplication
+    //     },
+    //     object: { sample: 'sample' }
+    // })({
+    //     action: await chevre.repository.Action.createInstance(mongoose.connection),
+    //     useFetchAPI: true
+    // });
 }
 
 main()

package/lib/chevre/service/notification.js

@@ -120,6 +120,7 @@ function sendEmailMessage(params) {
     });
 }
 exports.sendEmailMessage = sendEmailMessage;
+const MAX_LINE_NOTIFY_SUBJECT_LENGTH = 100;
 function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -141,10 +142,12 @@ function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel
         if (typeof accessToken !== 'string') {
             throw new Error('credentials.lineNotify.accessToken not set');
         }
-        const message = `--------
-${subject}
---------
-${content}`;
+        const shortSubject = (subject.length > MAX_LINE_NOTIFY_SUBJECT_LENGTH)
+            ? `${subject.slice(0, MAX_LINE_NOTIFY_SUBJECT_LENGTH)}...`
+            : subject;
+        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 (repos.useFetchAPI) {
             try {
                 const form = new FormData();

package/lib/chevre/service/payment/any.js

@@ -382,16 +382,16 @@ function authorize(params) {
                 //     "message": "The user aborted a request.",
                 //     "name": "AbortError"
                 // }
-                if (error.name !== 'AbortError') {
+                const rawError = Array.isArray(error) ? error[1] : undefined;
+                if (rawError !== undefined && rawError.name !== 'AbortError') {
                     yield processVoidPayTransaction({
                         project: action.project,
-                        // agent: { id: action.project.id },
                         id: action.id,
                         purpose: action.purpose
                     })(repos);
                 }
             }
-            // 複数対応(2024-03-27~)
+            // 複数対応(決済代行IFの場合、0:ChevreError,1:rawError)(2024-03-27~)
             if (Array.isArray(error)) {
                 throw error[0];
             }

package/lib/chevre/service/payment/movieTicket.js

@@ -99,14 +99,15 @@ function checkMovieTicket(params) {
             // }));
         }
         catch (error) {
+            // アクション保管用のエラーと両方保管(2024-05-22~)
+            const errors = [(0, errorHandler_1.handleMvtkReserveError)(error), error];
             try {
-                yield repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                yield repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error: errors });
             }
             catch (__) {
                 // 失敗したら仕方ない
             }
-            error = (0, errorHandler_1.handleMvtkReserveError)(error);
-            throw error;
+            throw errors[0];
         }
         const result = {
             purchaseNumberAuthIn: checkResult.purchaseNumberAuthIn,
@@ -161,7 +162,14 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
             payAction = yield payMovieTicket(payActionAttributes)(repos);
         }
         catch (error) {
-            throw (0, errorHandler_1.handleMvtkReserveError)(error);
+            // アクション保管用のエラーと両方throw(2024-05-22~)
+            if (Array.isArray(error)) {
+                throw error;
+            }
+            else {
+                throw [(0, errorHandler_1.handleMvtkReserveError)(error), error];
+            }
+            // throw handleMvtkReserveError(error);
         }
         return { accountId, payAction, accountsReceivablesByServiceType };
     });
@@ -240,12 +248,11 @@ function payMovieTicket(params) {
             typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
             seatInfoSyncIn
         };
-        const startingAction = Object.assign(Object.assign({}, params), { 
-            // accessCodeを隠蔽(2023-02-08~)
-            object: params.object.map((o) => {
+        const startingAction = Object.assign(Object.assign({}, params), { object: params.object.map((o) => {
                 const movieTicketsWithMaskedAccessCode = (Array.isArray(o.movieTickets))
                     ? o.movieTickets.map((movieTicket) => {
-                        return Object.assign(Object.assign({}, movieTicket), { accessCode: '****' });
+                        return Object.assign(Object.assign({}, movieTicket), { accessCode: '****' // accessCodeを隠蔽(2023-02-08~)
+                         });
                     })
                     : [];
                 return Object.assign(Object.assign({}, o), { movieTickets: movieTicketsWithMaskedAccessCode });
@@ -291,17 +298,18 @@ function payMovieTicket(params) {
                 }
             }
             if (throwsError) {
+                // アクション保管用のエラーと両方保管(2024-05-22~)
+                const errors = [(0, errorHandler_1.handleMvtkReserveError)(error), error];
                 try {
-                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: errors });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
                 }
-                error = (0, errorHandler_1.handleMvtkReserveError)(error);
-                throw error;
+                // error = handleMvtkReserveError(error);
+                throw errors;
             }
         }
-        // アクション完了
         const actionResult = { seatInfoSyncResult };
         action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
         yield (0, onPaid_1.onPaid)(action)(repos);

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.32.0-alpha.6"
+  "version": "21.32.0-alpha.8"
 }