@wenlarge/communication 1.1.2 → 1.1.3

package/dist/config/executor-core-config.d.ts

@@ -0,0 +1 @@
+export declare const EXECUTOR_CORE_PROTO_PATH: string[];

package/dist/config/executor-core-config.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EXECUTOR_CORE_PROTO_PATH = void 0;
+exports.EXECUTOR_CORE_PROTO_PATH = ["proto/executor-core.proto"];

package/dist/generated/executor-core.d.ts

@@ -0,0 +1,21 @@
+import { Metadata } from "@grpc/grpc-js";
+import { Observable } from "rxjs";
+export declare const protobufPackage = "executor_core";
+export interface ExecuteNodeRequest {
+    nodeTypeId: string;
+    nodeId: string;
+    config: string;
+    inputSchema: string;
+}
+export interface ExecuteNodeResponse {
+    lastResult: string;
+}
+export declare const EXECUTOR_CORE_PACKAGE_NAME = "executor_core";
+export interface CoreExecutionServiceClient {
+    executeNode(request: ExecuteNodeRequest, metadata?: Metadata): Observable<ExecuteNodeResponse>;
+}
+export interface CoreExecutionServiceController {
+    executeNode(request: ExecuteNodeRequest, metadata?: Metadata): Promise<ExecuteNodeResponse> | Observable<ExecuteNodeResponse> | ExecuteNodeResponse;
+}
+export declare function CoreExecutionServiceControllerMethods(): (constructor: Function) => void;
+export declare const CORE_EXECUTION_SERVICE_NAME = "CoreExecutionService";

package/dist/generated/executor-core.js

@@ -0,0 +1,27 @@
+"use strict";
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v1.181.2
+//   protoc               v6.33.2
+// source: executor-core.proto
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CORE_EXECUTION_SERVICE_NAME = exports.EXECUTOR_CORE_PACKAGE_NAME = exports.protobufPackage = void 0;
+exports.CoreExecutionServiceControllerMethods = CoreExecutionServiceControllerMethods;
+const microservices_1 = require("@nestjs/microservices");
+exports.protobufPackage = "executor_core";
+exports.EXECUTOR_CORE_PACKAGE_NAME = "executor_core";
+function CoreExecutionServiceControllerMethods() {
+    return function (constructor) {
+        const grpcMethods = ["executeNode"];
+        for (const method of grpcMethods) {
+            const descriptor = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+            (0, microservices_1.GrpcMethod)("CoreExecutionService", method)(constructor.prototype[method], method, descriptor);
+        }
+        const grpcStreamMethods = [];
+        for (const method of grpcStreamMethods) {
+            const descriptor = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+            (0, microservices_1.GrpcStreamMethod)("CoreExecutionService", method)(constructor.prototype[method], method, descriptor);
+        }
+    };
+}
+exports.CORE_EXECUTION_SERVICE_NAME = "CoreExecutionService";

package/dist/generated/workflow.d.ts

@@ -36,28 +36,26 @@ export interface TriggerExecutionRequest {
 export interface TriggerExecutionResponse {
     ok: boolean;
 }
-/** NODE SERVICE COMPS */
 export interface CreateWorkflowNodeRequest {
     workflowId: string;
     name: string;
-    type: string;
     positionX: number;
     positionY: number;
     inputSchema: string;
     outputSchema: string;
     config: string;
-    nextNodeIds: string[];
+    nodeTypeId: string;
 }
 export interface UpdateWorkflowNodeRequest {
     id: string;
     name: string;
-    type: string;
+    nodeTypeId: string;
     positionX: number;
     positionY: number;
-    nextNodeIds: string[];
     inputSchema: string;
     outputSchema: string;
     config: string;
+    workflowId: string;
 }
 export interface DeleteWorkflowNodeRequest {
     id: string;
@@ -80,15 +78,30 @@ export interface FindFirstWorkflowNodeResponse {
 export interface WorkflowNodeResponse {
     id: string;
     name: string;
-    type: string;
+    nodeTypeId: string;
     positionX: number;
     positionY: number;
     inputSchema: string;
     outputSchema: string;
     config: string;
-    nextNodeIds: string[];
     createdAt: string;
     updatedAt: string;
+    workflowId: string;
+}
+export interface WorkflowNodeConnection {
+    id: string;
+    workflowId: string;
+    fromNodeId: string;
+    toNodeId: string;
+}
+export interface UpdateBatchWorkflowRequest {
+    workflowId: string;
+    nodes: UpdateWorkflowNodeRequest[];
+    connections: UpdateBatchConnection[];
+}
+export interface UpdateBatchConnection {
+    fromNodeId: string;
+    toNodeId: string;
 }
 export declare const WORKFLOW_PACKAGE_NAME = "workflow";
 export interface WorkflowServiceClient {
@@ -102,6 +115,7 @@ export interface WorkflowServiceClient {
     findFirstWorkflowNode(request: FindFirstWorkflowNodeRequest, metadata?: Metadata): Observable<FindFirstWorkflowNodeResponse>;
     updateWorkflowNode(request: UpdateWorkflowNodeRequest, metadata?: Metadata): Observable<WorkflowNodeResponse>;
     deleteWorkflowNode(request: DeleteWorkflowNodeRequest, metadata?: Metadata): Observable<Empty>;
+    updateBatchWorkflow(request: UpdateBatchWorkflowRequest, metadata?: Metadata): Observable<Empty>;
 }
 export interface WorkflowServiceController {
     create(request: CreateWorkflowRequest, metadata?: Metadata): Promise<WorkflowResponse> | Observable<WorkflowResponse> | WorkflowResponse;
@@ -114,6 +128,7 @@ export interface WorkflowServiceController {
     findFirstWorkflowNode(request: FindFirstWorkflowNodeRequest, metadata?: Metadata): Promise<FindFirstWorkflowNodeResponse> | Observable<FindFirstWorkflowNodeResponse> | FindFirstWorkflowNodeResponse;
     updateWorkflowNode(request: UpdateWorkflowNodeRequest, metadata?: Metadata): Promise<WorkflowNodeResponse> | Observable<WorkflowNodeResponse> | WorkflowNodeResponse;
     deleteWorkflowNode(request: DeleteWorkflowNodeRequest, metadata?: Metadata): void;
+    updateBatchWorkflow(request: UpdateBatchWorkflowRequest, metadata?: Metadata): void;
 }
 export declare function WorkflowServiceControllerMethods(): (constructor: Function) => void;
 export declare const WORKFLOW_SERVICE_NAME = "WorkflowService";

package/dist/generated/workflow.js

@@ -23,6 +23,7 @@ function WorkflowServiceControllerMethods() {
             "findFirstWorkflowNode",
             "updateWorkflowNode",
             "deleteWorkflowNode",
+            "updateBatchWorkflow",
         ];
         for (const method of grpcMethods) {
             const descriptor = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);

package/dist/grpc-client/grpc-client.module.d.ts

@@ -3,6 +3,7 @@ export interface GrpcClientModuleOptions {
     authServiceUrl: string;
     projectServiceUrl: string;
     workflowServiceUrl: string;
+    executorCoreServiceUrl: string;
 }
 export declare class GrpcClientModule {
     static forRoot(options: GrpcClientModuleOptions): DynamicModule;

package/dist/grpc-client/grpc-client.module.js

@@ -48,6 +48,8 @@ const auth_config_1 = require("../config/auth-config");
 const project_config_1 = require("../config/project-config");
 const workflow_1 = require("../generated/workflow");
 const workflow_config_1 = require("../config/workflow-config");
+const executor_core_1 = require("../generated/executor-core");
+const executor_core_config_1 = require("../config/executor-core-config");
 let GrpcClientModule = (() => {
     let _classDecorators = [(0, common_1.Module)({})];
     let _classDescriptor;
@@ -108,6 +110,22 @@ let GrpcClientModule = (() => {
                                 },
                             },
                         },
+                        {
+                            name: executor_core_1.CORE_EXECUTION_SERVICE_NAME,
+                            transport: microservices_1.Transport.GRPC,
+                            options: {
+                                package: executor_core_1.EXECUTOR_CORE_PACKAGE_NAME,
+                                protoPath: executor_core_config_1.EXECUTOR_CORE_PROTO_PATH.map((p) => (0, path_1.join)(__dirname, "../../" + p)),
+                                url: options.executorCoreServiceUrl,
+                                loader: {
+                                    keepCase: true,
+                                    longs: String,
+                                    enums: String,
+                                    defaults: true,
+                                    oneofs: true,
+                                },
+                            },
+                        },
                     ]),
                 ],
                 exports: [microservices_1.ClientsModule],

package/dist/index.d.ts

@@ -6,4 +6,7 @@ export * from "./config/workflow-config";
 export * as Project from "./generated/project";
 export * from "./config/project-config";
 export * from "./grpc-client";
+export * from "./config/executor-core-config";
 export { Metadata } from "@grpc/grpc-js";
+export * as ExecutorCore from "./generated/executor-core";
+export * from "./kafka/kafka-topics";

package/dist/index.js

@@ -36,7 +36,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Metadata = exports.Project = exports.Workflow = exports.Auth = void 0;
+exports.ExecutorCore = exports.Metadata = exports.Project = exports.Workflow = exports.Auth = void 0;
 __exportStar(require("./helpers/helper"), exports);
 exports.Auth = __importStar(require("./generated/auth"));
 __exportStar(require("./config/auth-config"), exports);
@@ -45,5 +45,8 @@ __exportStar(require("./config/workflow-config"), exports);
 exports.Project = __importStar(require("./generated/project"));
 __exportStar(require("./config/project-config"), exports);
 __exportStar(require("./grpc-client"), exports);
+__exportStar(require("./config/executor-core-config"), exports);
 var grpc_js_1 = require("@grpc/grpc-js");
 Object.defineProperty(exports, "Metadata", { enumerable: true, get: function () { return grpc_js_1.Metadata; } });
+exports.ExecutorCore = __importStar(require("./generated/executor-core"));
+__exportStar(require("./kafka/kafka-topics"), exports);

package/dist/kafka/execution.types.d.ts

@@ -0,0 +1,23 @@
+export type TriggerExecutionPayload = {
+    nodeId: string;
+};
+export type ExecutionWaitingPayload = {
+    nodeId: string;
+    nodeTypeId: string;
+    workflowId: string;
+    config: string;
+    inputSchema: string;
+    triggeredAt: number;
+};
+export type ExecutionCompletedPayload = {
+    workflowId: string;
+    nodeId: string;
+    result: string;
+    finishedAt: number;
+};
+export type ExecutionFailedPayload = {
+    workflowId: string;
+    nodeId: string;
+    error: string;
+    failedAt: number;
+};

package/dist/kafka/execution.types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/kafka/kafka-topics.d.ts

@@ -1,3 +1,5 @@
-export declare enum KafkaTopics {
-    EXECUTION_TRIGGER = "execution.trigger"
-}
+export declare const KafkaTopics: {
+    readonly EXECUTION_COMPLETED: "execution.completed";
+    readonly EXECUTION_FAILED: "execution.failed";
+    readonly EXECUTION_WAITING: "execution.waiting";
+};

package/dist/kafka/kafka-topics.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KafkaTopics = void 0;
-var KafkaTopics;
-(function (KafkaTopics) {
-    KafkaTopics["EXECUTION_TRIGGER"] = "execution.trigger";
-})(KafkaTopics || (exports.KafkaTopics = KafkaTopics = {}));
+exports.KafkaTopics = {
+    EXECUTION_COMPLETED: "execution.completed",
+    EXECUTION_FAILED: "execution.failed",
+    EXECUTION_WAITING: "execution.waiting",
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenlarge/communication",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Shared gRPC proto interfaces and generated clients for Wenlarge microservices.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/proto/executor-core.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+package executor_core;
+
+message ExecuteNodeRequest {
+  string nodeTypeId = 1;
+  string nodeId = 2;
+  string config = 3;
+  string inputSchema = 4;
+}
+
+message ExecuteNodeResponse {
+  string lastResult = 1;
+}
+
+service CoreExecutionService {
+  rpc ExecuteNode (ExecuteNodeRequest) returns (ExecuteNodeResponse);
+}

package/proto/workflow.proto

@@ -15,6 +15,7 @@ service WorkflowService {
   rpc FindFirstWorkflowNode (FindFirstWorkflowNodeRequest) returns (FindFirstWorkflowNodeResponse);
   rpc UpdateWorkflowNode (UpdateWorkflowNodeRequest) returns (WorkflowNodeResponse);
   rpc DeleteWorkflowNode (DeleteWorkflowNodeRequest) returns (google.protobuf.Empty);
+  rpc UpdateBatchWorkflow (UpdateBatchWorkflowRequest) returns (google.protobuf.Empty);
 }
 
 message CreateWorkflowRequest {
@@ -59,29 +60,27 @@ message TriggerExecutionResponse{
     bool ok = 1;
 }
 
-// NODE SERVICE COMPS
 message CreateWorkflowNodeRequest{
     string workflowId = 1;
     string name = 2;
-    string type = 3;
-    int32 positionX = 4;
-    int32 positionY = 5;
-    string inputSchema = 6;
-    string outputSchema = 7;
-    string config = 8;
-    repeated string nextNodeIds = 9;
+    int32 positionX = 3;
+    int32 positionY = 4;
+    string inputSchema = 5;
+    string outputSchema = 6;
+    string config = 7;
+    string nodeTypeId = 8;
 }
 
 message UpdateWorkflowNodeRequest{
     string id = 1;
     string name = 2;
-    string type =3;
+    string nodeTypeId = 3;
     int32 positionX = 4;
     int32 positionY=5;
-    repeated string nextNodeIds = 6;
-    string inputSchema = 7;
-    string outputSchema = 8;
-    string config = 9;
+    string inputSchema = 6;
+    string outputSchema = 7;
+    string config = 8;
+    string workflowId = 9;
 }
 
 message DeleteWorkflowNodeRequest{
@@ -109,13 +108,31 @@ message FindFirstWorkflowNodeResponse{
 message WorkflowNodeResponse{
     string id = 1;
     string name = 2;
-    string type = 3;
+    string nodeTypeId = 3;
     int32 positionX = 4;
     int32 positionY = 5;
     string inputSchema = 6;
     string outputSchema = 7;
     string config = 8;
-    repeated string nextNodeIds = 9;
-    string createdAt = 10;
-    string updatedAt = 11;
+    string createdAt = 9;
+    string updatedAt = 10;
+    string workflowId = 11;
+}
+
+message WorkflowNodeConnection {
+  string id = 1;
+  string workflowId = 2;
+  string fromNodeId = 3;
+  string toNodeId = 4;
+}
+
+message UpdateBatchWorkflowRequest {
+  string workflowId = 1;
+  repeated UpdateWorkflowNodeRequest nodes = 2;
+  repeated UpdateBatchConnection connections = 3;
+}
+
+message UpdateBatchConnection {
+  string fromNodeId = 1;
+  string toNodeId = 2;
 }

package/src/generated/executor-core.ts

@@ -0,0 +1,53 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v1.181.2
+//   protoc               v6.33.2
+// source: executor-core.proto
+
+/* eslint-disable */
+import { Metadata } from "@grpc/grpc-js";
+import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { Observable } from "rxjs";
+
+export const protobufPackage = "executor_core";
+
+export interface ExecuteNodeRequest {
+  nodeTypeId: string;
+  nodeId: string;
+  config: string;
+  inputSchema: string;
+}
+
+export interface ExecuteNodeResponse {
+  lastResult: string;
+}
+
+export const EXECUTOR_CORE_PACKAGE_NAME = "executor_core";
+
+export interface CoreExecutionServiceClient {
+  executeNode(request: ExecuteNodeRequest, metadata?: Metadata): Observable<ExecuteNodeResponse>;
+}
+
+export interface CoreExecutionServiceController {
+  executeNode(
+    request: ExecuteNodeRequest,
+    metadata?: Metadata,
+  ): Promise<ExecuteNodeResponse> | Observable<ExecuteNodeResponse> | ExecuteNodeResponse;
+}
+
+export function CoreExecutionServiceControllerMethods() {
+  return function (constructor: Function) {
+    const grpcMethods: string[] = ["executeNode"];
+    for (const method of grpcMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcMethod("CoreExecutionService", method)(constructor.prototype[method], method, descriptor);
+    }
+    const grpcStreamMethods: string[] = [];
+    for (const method of grpcStreamMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcStreamMethod("CoreExecutionService", method)(constructor.prototype[method], method, descriptor);
+    }
+  };
+}
+
+export const CORE_EXECUTION_SERVICE_NAME = "CoreExecutionService";

package/src/generated/workflow.ts

@@ -54,29 +54,27 @@ export interface TriggerExecutionResponse {
   ok: boolean;
 }
 
-/** NODE SERVICE COMPS */
 export interface CreateWorkflowNodeRequest {
   workflowId: string;
   name: string;
-  type: string;
   positionX: number;
   positionY: number;
   inputSchema: string;
   outputSchema: string;
   config: string;
-  nextNodeIds: string[];
+  nodeTypeId: string;
 }
 
 export interface UpdateWorkflowNodeRequest {
   id: string;
   name: string;
-  type: string;
+  nodeTypeId: string;
   positionX: number;
   positionY: number;
-  nextNodeIds: string[];
   inputSchema: string;
   outputSchema: string;
   config: string;
+  workflowId: string;
 }
 
 export interface DeleteWorkflowNodeRequest {
@@ -105,15 +103,33 @@ export interface FindFirstWorkflowNodeResponse {
 export interface WorkflowNodeResponse {
   id: string;
   name: string;
-  type: string;
+  nodeTypeId: string;
   positionX: number;
   positionY: number;
   inputSchema: string;
   outputSchema: string;
   config: string;
-  nextNodeIds: string[];
   createdAt: string;
   updatedAt: string;
+  workflowId: string;
+}
+
+export interface WorkflowNodeConnection {
+  id: string;
+  workflowId: string;
+  fromNodeId: string;
+  toNodeId: string;
+}
+
+export interface UpdateBatchWorkflowRequest {
+  workflowId: string;
+  nodes: UpdateWorkflowNodeRequest[];
+  connections: UpdateBatchConnection[];
+}
+
+export interface UpdateBatchConnection {
+  fromNodeId: string;
+  toNodeId: string;
 }
 
 export const WORKFLOW_PACKAGE_NAME = "workflow";
@@ -144,6 +160,8 @@ export interface WorkflowServiceClient {
   updateWorkflowNode(request: UpdateWorkflowNodeRequest, metadata?: Metadata): Observable<WorkflowNodeResponse>;
 
   deleteWorkflowNode(request: DeleteWorkflowNodeRequest, metadata?: Metadata): Observable<Empty>;
+
+  updateBatchWorkflow(request: UpdateBatchWorkflowRequest, metadata?: Metadata): Observable<Empty>;
 }
 
 export interface WorkflowServiceController {
@@ -190,6 +208,8 @@ export interface WorkflowServiceController {
   ): Promise<WorkflowNodeResponse> | Observable<WorkflowNodeResponse> | WorkflowNodeResponse;
 
   deleteWorkflowNode(request: DeleteWorkflowNodeRequest, metadata?: Metadata): void;
+
+  updateBatchWorkflow(request: UpdateBatchWorkflowRequest, metadata?: Metadata): void;
 }
 
 export function WorkflowServiceControllerMethods() {
@@ -205,6 +225,7 @@ export function WorkflowServiceControllerMethods() {
       "findFirstWorkflowNode",
       "updateWorkflowNode",
       "deleteWorkflowNode",
+      "updateBatchWorkflow",
     ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);

package/dist/config/workflow-node-config.d.ts

@@ -1 +0,0 @@
-export declare const WORKFLOW_NODE_PROTO_PATH: string[];

package/dist/config/workflow-node-config.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WORKFLOW_NODE_PROTO_PATH = void 0;
-exports.WORKFLOW_NODE_PROTO_PATH = [
-    'proto/workflow-node.proto',
-];