@chevre/domain 22.11.0-alpha.14 → 22.11.0-alpha.16

package/lib/chevre/eventEmitter/task.d.ts

@@ -13,7 +13,7 @@ interface IExecuteSettings {
     redisClient?: RedisClientType;
 }
 type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
-type INextFunction = (task: Pick<factory.task.ITask<factory.taskName>, 'id' | 'remainingNumberOfTries' | 'name' | 'status' | 'data'>) => IOperationExecute<void>;
+type INextFunction = (task: Pick<factory.task.ITask<factory.taskName>, 'id' | 'remainingNumberOfTries' | 'name' | 'status'>) => IOperationExecute<void>;
 interface IReadyTask {
     id: string;
     name?: factory.taskName;
@@ -42,7 +42,6 @@ interface IExecutedTask {
      */
     remainingNumberOfTries: number;
     name: factory.taskName;
-    data: factory.task.IData<factory.taskName>;
     expires?: never;
 }
 type IChangedTask = IReadyTask | IRunningTask | IExecutedTask;

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

@@ -167,7 +167,6 @@ export declare class TaskRepo {
         status: factory.taskStatus.Executed | factory.taskStatus.Running;
         remainingNumberOfTries: number;
         name: factory.taskName;
-        data: factory.task.IData<factory.taskName>;
     }, executionResult: factory.task.IExecutionResult, next?: INextFunction): Promise<void>;
     count(params: factory.task.ISearchConditions): Promise<{
         count: number;
@@ -212,7 +211,6 @@ export declare class TaskRepo {
         remainingNumberOfTries: number;
         name: factory.taskName;
         status: factory.taskStatus;
-        data: import("@chevre/factory/lib/task").IData;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
@@ -222,13 +220,13 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     }> & {
         remainingNumberOfTries: number;
         name: factory.taskName;
         status: factory.taskStatus;
-        data: import("@chevre/factory/lib/task").IData;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
@@ -238,6 +236,7 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     } & {
@@ -246,7 +245,6 @@ export declare class TaskRepo {
         remainingNumberOfTries: number;
         name: factory.taskName;
         status: factory.taskStatus;
-        data: import("@chevre/factory/lib/task").IData;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
@@ -256,13 +254,13 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     }> & {
         remainingNumberOfTries: number;
         name: factory.taskName;
         status: factory.taskStatus;
-        data: import("@chevre/factory/lib/task").IData;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
@@ -272,6 +270,7 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     } & {

package/lib/chevre/repo/task.js

@@ -743,7 +743,7 @@ class TaskRepo {
     // support customr function(2025-05-25~)
     next) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { id, status, remainingNumberOfTries, name, data } = params;
+            const { id, status, remainingNumberOfTries, name } = params;
             yield this.taskModel.updateOne({ _id: { $eq: id } }, {
                 $set: { status },
                 $push: { executionResults: executionResult }
@@ -751,7 +751,7 @@ class TaskRepo {
                 .exec();
             // emit event(2025-05-26~)
             if (typeof next === 'function') {
-                const changedTask = { id, name, status, data, remainingNumberOfTries, executionResult };
+                const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
                 task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
             }
         });

package/lib/chevre/service/taskHandler.js

@@ -74,8 +74,7 @@ function executeTask(task, next) {
                 id: task.id,
                 status: factory.taskStatus.Executed,
                 remainingNumberOfTries: task.remainingNumberOfTries,
-                name: task.name,
-                data: task.data
+                name: task.name
             }, result, (typeof next === 'function') ? next : undefined);
         }
         catch (error) {
@@ -94,8 +93,7 @@ function executeTask(task, next) {
                 id: task.id,
                 status: task.status,
                 remainingNumberOfTries: task.remainingNumberOfTries,
-                name: task.name,
-                data: task.data
+                name: task.name
             }, result, (typeof next === 'function') ? next : undefined);
         }
     });

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.395.0",
-    "@cinerino/sdk": "11.0.0-alpha.8",
+    "@chevre/factory": "4.396.0-alpha.2",
+    "@cinerino/sdk": "11.1.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.14"
+  "version": "22.11.0-alpha.16"
 }

package/example/src/chevre/findExecutableTask.ts

@@ -1,50 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
-
-    setInterval(
-        async () => {
-            const startTime = process.hrtime();
-            const task = await taskRepo.findExecutableOne({
-                name: {
-                    $eq: chevre.factory.taskName.VoidReserveTransaction
-                    // $nin: [
-                    //     chevre.factory.taskName.DeleteTransaction,
-                    //     chevre.factory.taskName.ImportEventCapacitiesFromCOA,
-                    //     chevre.factory.taskName.ImportEventsFromCOA,
-                    //     chevre.factory.taskName.AcceptCOAOffer,
-                    //     chevre.factory.taskName.CheckMovieTicket,
-                    //     chevre.factory.taskName.AuthorizePayment,
-                    //     chevre.factory.taskName.PublishPaymentUrl
-                    // ]
-                },
-                runsAt: {
-                    $lt: moment()
-                        // tslint:disable-next-line:no-magic-numbers
-                        .add(-60, 'seconds')
-                        .toDate()
-                }
-            });
-            const diff = process.hrtime(startTime);
-            console.log(`took ${diff[0]} seconds and ${diff[1]} nanoseconds.`);
-
-            // tslint:disable-next-line:no-null-keyword
-            console.dir(task?.id, { depth: null });
-        },
-        // tslint:disable-next-line:no-magic-numbers
-        1000
-    );
-}
-
-main()
-    .then()
-    .catch(console.error);