Apply some ideas of code review

Author: Knerio

ts/src/action_sdk.ts

@@ -5,7 +5,7 @@ import {ActionTransferServiceClient, TransferRequest} from "@code0-tech/tucana/a
 import {FlowTypeSetting,} from "@code0-tech/tucana/shared";
 import {constructValue, toAllowedValue} from "@code0-tech/tucana/helpers";
 import 'reflect-metadata';
-import {connect as connectHelper} from "./sdk/connection/connection";
+import {connect} from "./sdk/connection/connection";
 import {registerFunctionDefinitionClass} from "./sdk/builder/registerFunctionDefinitionClass";
 import {registerRuntimeFunctionDefinitionClass} from "./builder/registerRuntimeFunctionDefinitionClass";
 
@@ -52,7 +52,7 @@ const createSdk = (config: ActionSdk["config"], configDefinitions?: HerculesActi
             state.stream?.responses.onError(handler)
         },
         connect: options => {
-            return connectHelper(state, config, options);
+            return connect(state, config, options);
         },
         getProjectActionConfigurations: () => {
             return state.projectConfigurations.map(value => {
@@ -97,7 +97,7 @@ const createSdk = (config: ActionSdk["config"], configDefinitions?: HerculesActi
                     linkedDataTypeIdentifiers: dataType.linkedDataTypes || [],
                     displayMessage: dataType.displayMessage || [],
                     definitionSource: "action",
-                    version: dataType.version || config.version,
+                    version: config.version,
                 });
             })
 
@@ -116,7 +116,7 @@ const createSdk = (config: ActionSdk["config"], configDefinitions?: HerculesActi
                     displayMessage: flowType.displayMessage || [],
                     documentation: flowType.documentation || [],
                     definitionSource: "action",
-                    version: flowType.version || config.version,
+                    version: config.version,
                     linkedDataTypeIdentifiers: flowType.linkedDataTypes || [],
                     settings: (flowType.settings || []).map(setting => ({
                         name: setting.name || [],
@@ -146,7 +146,7 @@ const createSdk = (config: ActionSdk["config"], configDefinitions?: HerculesActi
                         event: {
                             projectId: projectIdBigInt,
                             eventType: eventType,
-                            payload: constructValue(payload) || constructValue(null),
+                            payload: constructValue(payload || null),
                         }
                     }
                 })
@@ -161,5 +161,5 @@ const createSdk = (config: ActionSdk["config"], configDefinitions?: HerculesActi
 
 export {
     createSdk,
-    connectHelper as connect
+    connect
 }

ts/src/sdk/builder/builder.ts

@@ -20,7 +20,6 @@ export function buildRuntimeFunctionDefinition(klass: RuntimeFunctionDefinitionC
     const documentation: HerculesRuntimeFunctionDefinition["documentation"] = Reflect.getMetadata('hercules:documentation', klass) || []
     const signature: HerculesRuntimeFunctionDefinition["signature"] = Reflect.getMetadata('hercules:signature', klass)
     const linkedDataTypeIdentifiers: HerculesRuntimeFunctionDefinition["linkedDataTypes"] = Reflect.getMetadata('hercules:linked_data_type_identifiers', klass) || []
-    const version: HerculesRuntimeFunctionDefinition["version"] = Reflect.getMetadata('hercules:version', klass) || config.version
     const displayIcon: HerculesRuntimeFunctionDefinition["displayIcon"] = Reflect.getMetadata('hercules:display_icon', klass) || ""
     const throwsError: HerculesRuntimeFunctionDefinition["throwsError"] = Reflect.getMetadata('hercules:throws_error', klass) || false
     const runFunction = new klass().run
@@ -38,7 +37,7 @@ export function buildRuntimeFunctionDefinition(klass: RuntimeFunctionDefinitionC
             alias: alias || [],
             name: names || [],
             description: description || [],
-            version: version || config.version,
+            version: config.version,
             runtimeName: identifier,
             deprecationMessage: deprecationMessage || [],
             displayIcon: displayIcon || "tabler:note",

ts/src/sdk/builder/registerFunctionDefinitionClass.ts

@@ -27,7 +27,6 @@ export function registerFunctionDefinitionClass(config: {
         const documentation: HerculesFunctionDefinition["documentation"] = Reflect.getMetadata('hercules:documentation', klass)
         const signature: HerculesFunctionDefinition["signature"] = Reflect.getMetadata('hercules:signature', klass)
         const linkedDataTypeIdentifiers: HerculesFunctionDefinition["linkedDataTypes"] = Reflect.getMetadata('hercules:linked_data_type_identifiers', klass)
-        const version: HerculesFunctionDefinition["version"] = Reflect.getMetadata('hercules:version', klass)
         const displayIcon: HerculesFunctionDefinition["displayIcon"] = Reflect.getMetadata('hercules:display_icon', klass)
         const throwsError: HerculesFunctionDefinition["throwsError"] = Reflect.getMetadata('hercules:throws_error', klass)
 
@@ -49,7 +48,7 @@ export function registerFunctionDefinitionClass(config: {
                 signature: signature || runtimeDefinition.signature,
                 throwsError: throwsError || runtimeDefinition.throwsError,
                 alias: alias || runtimeDefinition.alias,
-                version: version || runtimeDefinition.version,
+                version: config.version,
                 description: description || runtimeDefinition.description,
                 name: names || runtimeDefinition.name,
                 documentation: documentation || runtimeDefinition.documentation,

ts/src/sdk/connection/connection.ts

@@ -35,7 +35,7 @@ export async function connect(state: SdkState, config: ActionSdk["config"], opti
 
     return new Promise(async (resolve, reject) => {
         try {
-            for await (let message of state?.stream?.responses || []) {
+            for await (const message of state?.stream?.responses || []) {
                 logger.debug({
                     message: message,
                     config,

ts/src/sdk/execution.ts

@@ -44,8 +44,7 @@ function buildContext(message: TransferResponse, execution: ExecutionRequest, st
     const params = buildParams(execution, func, message);
 
     let conf = state.projectConfigurations.find(config => {
-        //TODO
-        return true
+        return config.projectId === execution.projectId
     })
 
     if (!conf) {
@@ -97,7 +96,7 @@ export function handleExecutionRequest(state: SdkState, message: TransferRespons
         context
     })
 
-    const funcHandler = (func as any).handler
+    const funcHandler = func.handler
 
     if (funcHandler.length == params.length + 1) {
         // handler has context parameter
@@ -110,14 +109,7 @@ export function handleExecutionRequest(state: SdkState, message: TransferRespons
         return;
     }
 
-    const result = new Promise((resolve, reject) => {
-        try {
-            resolve(funcHandler(...params))
-        } catch (e) {
-            reject(e)
-        }
-    })
-    result.then((value: any) => {
+    Promise.resolve(funcHandler(...params)) .then((value: any) => {
         const request = TransferRequest.create({
             data: {
                 oneofKind: "result",

ts/src/types.ts

@@ -30,9 +30,7 @@ export interface HerculesDataType {
     rules?: DefinitionDataTypeRule[],
     genericKeys?: string[],
     type: string,
-    linkedDataTypes?: string[],
-    // Will default to sdk version
-    version?: string
+    linkedDataTypes?: string[]
 }
 
 export interface HerculesFlowTypeSetting {
@@ -55,7 +53,6 @@ export interface HerculesFlowType {
     documentation?: HerculesTranslation[],
     displayMessage?: HerculesTranslation[],
     alias?: HerculesTranslation[],
-    version?: string,
     displayIcon?: string,
 }
 
@@ -81,7 +78,6 @@ export interface HerculesRuntimeFunctionDefinition {
     displayMessage?: HerculesTranslation[],
     alias?: HerculesTranslation[],
     linkedDataTypes?: string[],
-    version?: string,
     displayIcon?: string,
 }
 
@@ -109,7 +105,6 @@ export interface HerculesFunctionDefinition {
     displayMessage?: HerculesTranslation[],
     alias?: HerculesTranslation[],
     linkedDataTypes?: string[],
-    version?: string,
     displayIcon?: string,
 }
 
@@ -222,9 +217,6 @@ export const Signature = (signature: string): ClassDecorator =>
 export const LinkedDataTypeIdentifiers = (...linkedDataTypeIdentifiers: string[]): ClassDecorator =>
     (target) => Reflect.defineMetadata('hercules:linked_data_type_identifiers', linkedDataTypeIdentifiers, target)
 
-export const Version = (version: string): ClassDecorator =>
-    (target) => Reflect.defineMetadata('hercules:version', version, target)
-
 export const ThrowsError = (throwsError: boolean = true): ClassDecorator =>
     (target) => Reflect.defineMetadata('hercules:throws_error', throwsError, target)