@asyncapi/generator 2.8.3 → 2.8.4

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/components/InitConnector.js

@@ -1,41 +1,24 @@
 import { Text } from '@asyncapi/generator-react-sdk';
+import TimedConnection from './TimedConnection';
+import URIParams from './URIParams';
+import { CloseConnection } from '@asyncapi/generator-components';
 
-export default function InitConnector() {
+export default function InitConnector({ queryParamsArray, pathName, sendOperations }) {
   return (
-    <Text newLines={1}>
+    <Text>
       {`
   @PostConstruct
   void openAndSendMessagesWithDelay() {
       new Thread(() -> {
           try {
-              Log.info("Starting WebSocket connection attempt...");
-              WebSocketClientConnection connection = connector.connectAndAwait();
-
-              // Wait 2 seconds before first message
-              Thread.sleep(2000);
-
-              // Send 5 messages
-              for (int i = 1; i <= 5; i++) {
-                  String msg = "Message #" + i + " from Quarkus";
-                  connection.sendTextAndAwait(msg);
-                  Log.info("Sent: " + msg);
-                  Thread.sleep(5000);
-              }
-
-              // Wait 10 seconds after final message
-              Log.info("All messages sent. Waiting 10 seconds before closing...");
-              Thread.sleep(10000);
-
-              connection.closeAndAwait();
-              Log.info("Connection closed gracefully.");
-
-          } catch (Exception e) {
-              Log.error("Error during WebSocket communication", e);
-          }
-      }).start();
-  }
-}
-`}
+            Log.info("Starting WebSocket connection attempt...");`}
+      {
+        (!queryParamsArray || queryParamsArray.length === 0) && (
+          <TimedConnection sendOperations={sendOperations} />
+        )
+      }
+      <URIParams queryParamsArray={queryParamsArray} pathName={pathName} />
+      <CloseConnection language="java" framework="quarkus" methodName="" indent={0} />
     </Text>
   );
 }

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/components/OnTextMessageHandler.js

@@ -1,24 +1,64 @@
 import { Text } from '@asyncapi/generator-react-sdk';
+import { toCamelCase } from '@asyncapi/generator-helpers';
 
-export default function OnTextMessage({sendOperations}) {
-  if (!sendOperations || sendOperations.length === 0) {
-    return null;
-  }
-
+export default function OnTextMessage({ sendOperations }) {
   return (
     <>
       {
-        sendOperations.map((operation) => {
-          const methodName = operation.id();          
-          return (
-            <Text newLines={2} indent={2}>
-              {`@OnTextMessage
-public void ${methodName}(String message, WebSocketClientConnection connection) {
-    Log.info("Received text message: " + message);
+        // If there are operations, emit a single @OnTextMessage
+        (sendOperations && sendOperations.length !== 0) && (
+          <Text newLines={2} indent={2}>
+            {`@OnTextMessage
+public void handleTextMessage(String message, WebSocketClientConnection connection) {
+    LOG.info("Handler received text message: " + message);
+${sendOperations.map((operation, idx) => {
+            const methodName = operation.id();
+            const javaMethodName = toCamelCase(methodName);
+            const condition = idx === 0 ? `    if (message != null && message.contains("${methodName}")) {` : `    else if (message != null && message.contains("${methodName}")) {`;
+            return `${condition}
+        ${javaMethodName}(message, connection);
+    }`;
+          }).join('\n')}
+    else {
+        LOG.warn("Handler received unrecognized message type. Falling back to default handler.");
+        // Note: By default, we route unrecognized messages to the first operation handler.
+        // Depending on your business logic, you may want to change this behavior.
+        ${toCamelCase(sendOperations[0].id())}(message, connection);
+    }
+}`}
+          </Text>
+        )
+      }
+
+      {
+        // Generate handlers for each operation
+        (sendOperations && sendOperations.length !== 0) && (
+          sendOperations.map((operation) => {
+            const methodName = operation.id();
+            const javaMethodName = toCamelCase(methodName);
+            return (
+              <Text newLines={2} indent={2}>
+                {`public void ${javaMethodName}(String message, WebSocketClientConnection connection) {
+    LOG.info("Processing ${methodName} type message: " + message);
+    // TODO: implement processing logic for ${methodName}
 }`}
-            </Text>
-          );
-        })
+              </Text>
+            );
+          })
+        )
+      }
+
+      {
+        // No operations provided need a default handler
+        (!sendOperations || sendOperations.length === 0) && (
+          <Text newLines={2} indent={2}>
+            {`@OnTextMessage
+public void processTextMessage(String message, WebSocketClientConnection connection) {
+    LOG.info("Received text message: " + message);
+}`}
+          </Text>
+
+        )
       }
     </>
   );

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/components/TimedConnection.js

@@ -0,0 +1,31 @@
+import { Text } from '@asyncapi/generator-react-sdk';
+
+export default function TimedConnection({ sendOperations }) {
+  const initialDelayMs = 2000;
+  const messageCount = 5; 
+  const messageIntervalMs = 5000; 
+  const finalDelayMs = 10000; 
+  const firstOperationId = sendOperations && sendOperations.length > 0 ? sendOperations[0].id() : null;
+  return (
+    <Text newLines={2}>
+      {`
+            WebSocketClientConnection connection = connector.connectAndAwait();
+
+            // Wait 2 seconds before first message
+            Thread.sleep(${initialDelayMs});
+
+            // Send ${messageCount} messages
+            for (int i = 1; i <= ${messageCount}; i++) {
+                // Send a message to any available operation by including its operation ID (i.e. "${firstOperationId}")
+                String msg = ${firstOperationId ? `"Message #" + i + " from Quarkus for ${firstOperationId}"` : '"Message #" + i + " from Quarkus"'};
+                connection.sendTextAndAwait(msg);
+                Log.info("Sent: " + msg);
+                Thread.sleep(${messageIntervalMs}); // Wait 5 seconds between messages
+            }
+
+            // Wait 10 seconds after final message
+            Log.info("All messages sent. Waiting 10 seconds before closing...");
+            Thread.sleep(${finalDelayMs});`}
+    </Text>
+  );
+}

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/components/URIParams.js

@@ -0,0 +1,60 @@
+import { Text } from '@asyncapi/generator-react-sdk';
+import { toCamelCase } from '@asyncapi/generator-helpers';
+
+export default function URIParams({ queryParamsArray, pathName }) {
+  if (!queryParamsArray || queryParamsArray.length === 0) {
+    return null; // Return null if no query params
+  }
+
+  return (
+    <>
+      <Text newLines={1}>
+        {`
+            // URI parameters
+            String query = "";
+            `}
+      </Text>
+      {queryParamsArray.map((param, idx) => {
+        const paramName = toCamelCase(param[0]);
+        const variableDefinition = `String ${paramName} = System.getenv("${paramName.toUpperCase()}");`;
+        const errorCheck = `if(${paramName} == null || ${paramName}.isEmpty()){`;
+        const errorMessage = `throw new IllegalArgumentException("Required environment variable ${paramName.toUpperCase()} is missing or empty");`;
+        const closingTag = '}';
+
+        let additionalQuery = '';
+        if (idx === 0) {
+          additionalQuery = `query += "${param[0]}=" + URLEncoder.encode(${paramName}, StandardCharsets.UTF_8);\n`;
+        } else {
+          additionalQuery = `query += "&${param[0]}=" + URLEncoder.encode(${paramName}, StandardCharsets.UTF_8);\n`;
+        }
+
+        return (
+          <>
+            <Text indent={12}>
+              {variableDefinition}
+            </Text>
+            <Text indent={12}>
+              {errorCheck}
+            </Text>
+            <Text indent={14}>
+              {errorMessage}
+            </Text>
+            <Text indent={12}>
+              {closingTag}
+            </Text>
+            <Text indent={12}>
+              {additionalQuery}
+            </Text>
+          </>
+        );
+      })}
+      <Text>
+        {`
+            String queryUri = baseURI + "${pathName}" + "?" + query;
+            WebSocketClientConnection connection = connector.baseUri(queryUri).connectAndAwait();
+            Thread.sleep(120000); // Keep the connection open for 2 minutes
+            `}
+      </Text>
+    </>
+  );
+}

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/components/dependencies/ClientDependencies.js

@@ -1,23 +1,17 @@
-import { Text } from '@asyncapi/generator-react-sdk';
+import { DependencyProvider } from '@asyncapi/generator-components';
 
-export function ClientDependencies() {
+export function ClientDependencies({ queryParams }) {
+  const additionalDependencies = [];
+  if (queryParams) {
+    additionalDependencies.push('import java.util.HashMap;');
+  }
   return (
-    <Text>
-      <Text>
-        {`
-package com.asyncapi;
-
-import io.quarkus.websockets.next.WebSocketClient;
-import io.quarkus.websockets.next.WebSocketClientConnection;
-import io.quarkus.websockets.next.OnOpen;
-import io.quarkus.websockets.next.OnClose;
-import io.quarkus.websockets.next.OnError;
-import io.quarkus.websockets.next.OnTextMessage;
-import io.quarkus.websockets.next.CloseReason;
-import jakarta.inject.Inject;
-import io.quarkus.logging.Log;`}
-      </Text>
-    </Text>
+    <DependencyProvider
+      language="java"
+      framework="quarkus"
+      role="client"
+      additionalDependencies={additionalDependencies}
+    />
   );
 }
 

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/components/dependencies/ConnectorDependencies.js

@@ -1,20 +1,20 @@
-import { Text } from '@asyncapi/generator-react-sdk';
+import { DependencyProvider } from '@asyncapi/generator-components';
 
-export function ConnectorDependencies() {
-  return (
-    <Text>
-      <Text>
-        {`
-package com.asyncapi;
+export function ConnectorDependencies({ queryParams }) {
+  const additionalDependencies = [];
+  if (queryParams) {
+    additionalDependencies.push('import org.eclipse.microprofile.config.inject.ConfigProperty;');
+    additionalDependencies.push('import java.net.URI;');
+    additionalDependencies.push('import java.net.URLEncoder;');
+    additionalDependencies.push('import java.nio.charset.StandardCharsets;');
+  }
 
-import io.quarkus.websockets.next.WebSocketConnector;
-import io.quarkus.websockets.next.WebSocketClientConnection;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-import jakarta.annotation.PostConstruct;
-import io.quarkus.logging.Log;
-import io.quarkus.runtime.Startup;`}
-      </Text>
-    </Text>
+  return (
+    <DependencyProvider
+      language="java"
+      framework="quarkus"
+      role="connector"
+      additionalDependencies={additionalDependencies}
+    />
   );
 }

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/package.json

@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@asyncapi/generator-helpers": "0.2.0",
-    "@asyncapi/generator-components": "0.2.0",
+    "@asyncapi/generator-components": "0.3.1",
     "@asyncapi/generator-react-sdk": "^1.1.2"
   },
   "devDependencies": {

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/template/pom.xml

@@ -12,7 +12,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.23.0</quarkus.platform.version>
+        <quarkus.platform.version>3.25.2</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.5.2</surefire-plugin.version>
     </properties>
@@ -49,6 +49,20 @@
             <artifactId>quarkus-junit5</artifactId>
             <scope>test</scope>
         </dependency>
+        
+        <!-- K8s additions -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-jib</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/template/src/main/java/com/asyncapi/client.java.js

@@ -1,4 +1,4 @@
-import { getClientName, getInfo, getServer, getTitle } from '@asyncapi/generator-helpers';
+import { getClientName, getInfo, getQueryParams, getServer, getTitle } from '@asyncapi/generator-helpers';
 import { File } from '@asyncapi/generator-react-sdk';
 import { FileHeaderInfo } from '@asyncapi/generator-components';
 import { ClientDependencies } from '../../../../../../components/dependencies/ClientDependencies.js';
@@ -8,6 +8,7 @@ export default async function ({ asyncapi, params }) {
   const server = getServer(asyncapi.servers(), params.server);
   const info = getInfo(asyncapi);
   const title = getTitle(asyncapi);
+  const queryParams = getQueryParams(asyncapi.channels());
   const clientName = getClientName(asyncapi, params.appendClientSuffix, params.customClientName);
   const operations = asyncapi.operations();
   const clientJavaName = `${clientName}.java`;
@@ -20,8 +21,8 @@ export default async function ({ asyncapi, params }) {
         server={server}
         language="java"
       />
-      <ClientDependencies/>
-      <EchoWebSocket clientName={clientName} pathName={pathName} title={title} operations={operations} />
+      <ClientDependencies queryParams={queryParams}/>
+      <EchoWebSocket clientName={clientName} pathName={pathName} title={title} queryParams={queryParams} operations={operations} />
     </File>
   );
 }

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/template/src/main/java/com/asyncapi/connector.java.js

@@ -1,16 +1,20 @@
-import { getClientName } from '@asyncapi/generator-helpers';
+import { getClientName, getQueryParams, getServer } from '@asyncapi/generator-helpers';
 import { File } from '@asyncapi/generator-react-sdk';
 import { ConnectorDependencies } from '../../../../../../components/dependencies/ConnectorDependencies.js';
 import ClientConnector from '../../../../../../components/ClientConnector.js';
 
 export default async function ({ asyncapi, params }) {
+  const server = getServer(asyncapi.servers(), params.server);
   const clientName = getClientName(asyncapi, params.appendClientSuffix, params.customClientName);
+  const queryParams = getQueryParams(asyncapi.channels());
   const clientConnectorName = `${clientName}Connector.java`;
+  const pathName = server.pathname();
+  const operations = asyncapi.operations();
   
   return (
     <File name={clientConnectorName}>
-      <ConnectorDependencies/>
-      <ClientConnector clientName={clientName} />
+      <ConnectorDependencies queryParams={queryParams}/>
+      <ClientConnector clientName={clientName} query={queryParams} pathName={pathName} operations={operations} />
     </File>
   );
 }

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/template/src/main/java/com/asyncapi/models/model.js

@@ -1,36 +1,6 @@
-import { JAVA_COMMON_PRESET } from '@asyncapi/modelina';
 import { Models } from '@asyncapi/generator-components';
+import { JavaModelsPresets } from '@asyncapi/generator-helpers';
 
 export default async function({ asyncapi }) {
-  const websocketJavaPreset = {
-    class: {
-      self({ content, dependencyManager }) {
-        return `package com.asyncapi.models;\n\n${content}`;
-      },
-      property({ content, property }) {
-        if (property.property && property.property.type === 'Integer') {
-          return `@Service\n${content}`;
-        }
-        return content;
-      },
-      additionalContent({ content }) {
-        return content;
-      }
-    }
-  };
-
-  const combinedPresets = [
-    {
-      preset: JAVA_COMMON_PRESET,
-      options: {
-        equal: true,
-        hashCode: false,
-        classToString: true,
-        marshalling: false
-      }
-    },
-    websocketJavaPreset
-  ];
-
-  return await Models({ asyncapi, language: 'java', format: 'toPascalCase', presets: combinedPresets});
+  return await Models({ asyncapi, language: 'java', format: 'toPascalCase', presets: JavaModelsPresets });
 }

package/lib/templates/bakedInTemplates/core-template-client-websocket-java-quarkus/template/src/main/resources/AppProperties.js

@@ -1,10 +1,13 @@
-import { getClientName, getServer, getServerHost} from '@asyncapi/generator-helpers';
+import { getClientName, getServer, getServerHost, getServerProtocol } from '@asyncapi/generator-helpers';
 import { Text, File } from '@asyncapi/generator-react-sdk';
 
 export default function AppProperties({ asyncapi, params }) {
   const server = getServer(asyncapi.servers(), params.server);
   const clientName = getClientName(asyncapi, params.appendClientSuffix, params.customClientName);
   const serverHost = getServerHost(server);
+  const serverProtocol = getServerProtocol(server);
+ 
+  const protocol = `${serverProtocol}://`;
 
   return (
     <File name="application.properties">
@@ -12,7 +15,7 @@ export default function AppProperties({ asyncapi, params }) {
         {`# application.properties
 
 # Define a named base-uri for ${clientName}
-com.asyncapi.${clientName}.base-uri=wss://${serverHost}`}
+com.asyncapi.${clientName}.base-uri=${protocol}${serverHost}`}
       </Text>
     </File>
   );

package/lib/templates/bakedInTemplates/core-template-client-websocket-javascript/__transpiled/components/ClientClass.js

@@ -5,10 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 require('source-map-support/register');
 var generatorReactSdk = require('@asyncapi/generator-react-sdk');
 var Constructor = require('./Constructor.js');
-var Connect = require('./Connect.js');
-var RegisterErrorHandler = require('./RegisterErrorHandler.js');
-var HandleMessage = require('./HandleMessage.js');
-var SendOperation = require('./SendOperation.js');
 var generatorComponents = require('@asyncapi/generator-components');
 var ModuleExport = require('./ModuleExport.js');
 var jsxRuntime = require('/home/runner/work/generator/generator/node_modules/react/cjs/react-jsx-runtime.production.min.js');
@@ -25,12 +21,20 @@ function ClientClass({
       children: `class ${clientName} {`
     }), /*#__PURE__*/jsxRuntime.jsx(Constructor.Constructor, {
       serverUrl: serverUrl
-    }), /*#__PURE__*/jsxRuntime.jsx(Connect.Connect, {
+    }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.Connect, {
+      language: "javascript",
       title: title
     }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.RegisterMessageHandler, {
       language: "javascript",
       methodParams: ['handler']
-    }), /*#__PURE__*/jsxRuntime.jsx(RegisterErrorHandler.RegisterErrorHandler, {}), /*#__PURE__*/jsxRuntime.jsx(HandleMessage.HandleMessage, {}), /*#__PURE__*/jsxRuntime.jsx(SendOperation.SendOperation, {
+    }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.RegisterErrorHandler, {
+      language: "javascript",
+      methodParams: ['handler']
+    }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.HandleMessage, {
+      language: "javascript",
+      methodParams: ['message', 'cb']
+    }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.SendOperations, {
+      language: "javascript",
       sendOperations: sendOperations,
       clientName: clientName
     }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.CloseConnection, {

package/lib/templates/bakedInTemplates/core-template-client-websocket-javascript/__transpiled/components/ClientClass.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClientClass.js","sources":["../../../../../../../../packages/templates/clients/websocket/javascript/components/ClientClass.js"],"sourcesContent":["import { Text } from '@asyncapi/generator-react-sdk';\nimport { Constructor } from './Constructor';\nimport { Connect } from './Connect';\nimport { RegisterErrorHandler } from './RegisterErrorHandler';\nimport { HandleMessage } from './HandleMessage';\nimport { SendOperation } from './SendOperation';\nimport { CloseConnection, RegisterMessageHandler } from '@asyncapi/generator-components';\nimport { ModuleExport } from './ModuleExport';\n\nexport function ClientClass({ clientName, serverUrl, title, sendOperations}) {\n  return (\n    <Text>\n      <Text newLines={2}>\n        {`class ${clientName} {`}\n      </Text>\n      <Constructor serverUrl={serverUrl} />\n      <Connect title={title} />\n      <RegisterMessageHandler \n        language=\"javascript\" \n        methodParams={['handler']}\n      />\n      <RegisterErrorHandler />\n      <HandleMessage />\n      <SendOperation sendOperations={sendOperations} clientName={clientName} />\n      <CloseConnection language=\"javascript\" />\n      <Text>\n        {'}'}\n      </Text>\n      <ModuleExport clientName={clientName} />\n    </Text>\n  );\n}\n"],"names":["ClientClass","clientName","serverUrl","title","sendOperations","_jsxs","Text","children","_jsx","newLines","Constructor","Connect","RegisterMessageHandler","language","methodParams","RegisterErrorHandler","HandleMessage","SendOperation","CloseConnection","ModuleExport"],"mappings":";;;;;;;;;;;;;;;AASO,SAASA,WAAWA,CAAC;EAAEC,UAAU;EAAEC,SAAS;EAAEC,KAAK;AAAEC,EAAAA,cAAAA;AAAc,CAAC,EAAE;EAC3E,oBACEC,eAAA,CAACC,sBAAI,EAAA;IAAAC,QAAA,EAAA,cACHC,cAAA,CAACF,sBAAI,EAAA;AAACG,MAAAA,QAAQ,EAAE,CAAE;MAAAF,QAAA,EACf,SAASN,UAAU,CAAA,EAAA,CAAA;AAAI,KACpB,CAAC,eACPO,cAAA,CAACE,uBAAW,EAAA;AAACR,MAAAA,SAAS,EAAEA,SAAAA;AAAU,KAAE,CAAC,eACrCM,cAAA,CAACG,eAAO,EAAA;AAACR,MAAAA,KAAK,EAAEA,KAAAA;AAAM,KAAE,CAAC,eACzBK,cAAA,CAACI,0CAAsB,EAAA;AACrBC,MAAAA,QAAQ,EAAC,YAAY;MACrBC,YAAY,EAAE,CAAC,SAAS,CAAA;AAAE,KAC3B,CAAC,eACFN,cAAA,CAACO,yCAAoB,IAAE,CAAC,eACxBP,cAAA,CAACQ,2BAAa,EAAE,EAAA,CAAC,eACjBR,cAAA,CAACS,2BAAa,EAAA;AAACb,MAAAA,cAAc,EAAEA,cAAe;AAACH,MAAAA,UAAU,EAAEA,UAAAA;AAAW,KAAE,CAAC,eACzEO,cAAA,CAACU,mCAAe,EAAA;AAACL,MAAAA,QAAQ,EAAC,YAAA;AAAY,KAAE,CAAC,eACzCL,cAAA,CAACF,sBAAI,EAAA;AAAAC,MAAAA,QAAA,EACF,GAAA;AAAG,KACA,CAAC,eACPC,cAAA,CAACW,yBAAY,EAAA;AAAClB,MAAAA,UAAU,EAAEA,UAAAA;AAAW,KAAE,CAAC,CAAA;AAAA,GACpC,CAAC,CAAA;AAEX;;;;"}
+{"version":3,"file":"ClientClass.js","sources":["../../../../../../../../packages/templates/clients/websocket/javascript/components/ClientClass.js"],"sourcesContent":["import { Text } from '@asyncapi/generator-react-sdk';\nimport { Constructor } from './Constructor';\nimport { CloseConnection, RegisterMessageHandler, RegisterErrorHandler, SendOperations, Connect, HandleMessage } from '@asyncapi/generator-components';\nimport { ModuleExport } from './ModuleExport';\n\nexport function ClientClass({ clientName, serverUrl, title, sendOperations}) {\n  return (\n    <Text>\n      <Text newLines={2}>\n        {`class ${clientName} {`}\n      </Text>\n      <Constructor serverUrl={serverUrl} />\n      <Connect language=\"javascript\" title={title} />\n      <RegisterMessageHandler \n        language=\"javascript\" \n        methodParams={['handler']}\n      />\n      <RegisterErrorHandler\n        language=\"javascript\" \n        methodParams={['handler']}\n      />\n      <HandleMessage \n        language=\"javascript\" \n        methodParams={['message', 'cb']}\n      />\n      <SendOperations \n        language=\"javascript\" \n        sendOperations={sendOperations} \n        clientName={clientName} \n      />\n      <CloseConnection language=\"javascript\" />\n      <Text>\n        {'}'}\n      </Text>\n      <ModuleExport clientName={clientName} />\n    </Text>\n  );\n}\n"],"names":["ClientClass","clientName","serverUrl","title","sendOperations","_jsxs","Text","children","_jsx","newLines","Constructor","Connect","language","RegisterMessageHandler","methodParams","RegisterErrorHandler","HandleMessage","SendOperations","CloseConnection","ModuleExport"],"mappings":";;;;;;;;;;;AAKO,SAASA,WAAWA,CAAC;EAAEC,UAAU;EAAEC,SAAS;EAAEC,KAAK;AAAEC,EAAAA,cAAAA;AAAc,CAAC,EAAE;EAC3E,oBACEC,eAAA,CAACC,sBAAI,EAAA;IAAAC,QAAA,EAAA,cACHC,cAAA,CAACF,sBAAI,EAAA;AAACG,MAAAA,QAAQ,EAAE,CAAE;MAAAF,QAAA,EACf,SAASN,UAAU,CAAA,EAAA,CAAA;AAAI,KACpB,CAAC,eACPO,cAAA,CAACE,uBAAW,EAAA;AAACR,MAAAA,SAAS,EAAEA,SAAAA;AAAU,KAAE,CAAC,eACrCM,cAAA,CAACG,2BAAO,EAAA;AAACC,MAAAA,QAAQ,EAAC,YAAY;AAACT,MAAAA,KAAK,EAAEA,KAAAA;AAAM,KAAE,CAAC,eAC/CK,cAAA,CAACK,0CAAsB,EAAA;AACrBD,MAAAA,QAAQ,EAAC,YAAY;MACrBE,YAAY,EAAE,CAAC,SAAS,CAAA;AAAE,KAC3B,CAAC,eACFN,cAAA,CAACO,wCAAoB,EAAA;AACnBH,MAAAA,QAAQ,EAAC,YAAY;MACrBE,YAAY,EAAE,CAAC,SAAS,CAAA;AAAE,KAC3B,CAAC,eACFN,cAAA,CAACQ,iCAAa,EAAA;AACZJ,MAAAA,QAAQ,EAAC,YAAY;AACrBE,MAAAA,YAAY,EAAE,CAAC,SAAS,EAAE,IAAI,CAAA;AAAE,KACjC,CAAC,eACFN,cAAA,CAACS,kCAAc,EAAA;AACbL,MAAAA,QAAQ,EAAC,YAAY;AACrBR,MAAAA,cAAc,EAAEA,cAAe;AAC/BH,MAAAA,UAAU,EAAEA,UAAAA;AAAW,KACxB,CAAC,eACFO,cAAA,CAACU,mCAAe,EAAA;AAACN,MAAAA,QAAQ,EAAC,YAAA;AAAY,KAAE,CAAC,eACzCJ,cAAA,CAACF,sBAAI,EAAA;AAAAC,MAAAA,QAAA,EACF,GAAA;AAAG,KACA,CAAC,eACPC,cAAA,CAACW,yBAAY,EAAA;AAAClB,MAAAA,UAAU,EAAEA,UAAAA;AAAW,KAAE,CAAC,CAAA;AAAA,GACpC,CAAC,CAAA;AAEX;;;;"}

package/lib/templates/bakedInTemplates/core-template-client-websocket-javascript/__transpiled/template/client.js.js

@@ -25,128 +25,6 @@ constructor(url) {
   });
 }
 
-function Connect({
-  title
-}) {
-  return /*#__PURE__*/jsxRuntime.jsx(generatorReactSdk.Text, {
-    newLines: 2,
-    indent: 2,
-    children: `// Method to establish a WebSocket connection
-connect() {
-  return new Promise((resolve, reject) => {
-    this.websocket = new WebSocket(this.url);
-
-    // On successful connection
-    this.websocket.onopen = () => {
-      console.log('Connected to ${title} server');
-      resolve();
-    };
-
-    // On receiving a message
-    this.websocket.onmessage = (event) => {
-      if (this.messageHandlers.length > 0) {
-        // Call custom message handlers
-        this.messageHandlers.forEach(handler => {
-          if (typeof handler === 'function') {
-            this.handleMessage(event.data, handler);
-          }
-        });
-      } else {
-        // Default message logging
-        console.log('Message received:', event.data);
-      }
-    };
-
-    // On error first call custom error handlers, then default error behavior
-    this.websocket.onerror = (error) => {
-      if (this.errorHandlers.length > 0) {
-        // Call custom error handlers
-        this.errorHandlers.forEach(handler => handler(error));
-      } else {
-        // Default error behavior
-        console.error('WebSocket Error:', error);
-      }
-      reject(error);
-    };
-
-    // On connection close
-    this.websocket.onclose = () => {
-      console.log('Disconnected from ${title} server');
-    };
-  });
-}`
-  });
-}
-
-function RegisterErrorHandler() {
-  return /*#__PURE__*/jsxRuntime.jsx(generatorReactSdk.Text, {
-    newLines: 2,
-    indent: 2,
-    children: `// Method to register custom error handlers
-registerErrorHandler(handler) {
-  if (typeof handler === 'function') {
-    this.errorHandlers.push(handler);
-  } else {
-    console.warn('Error handler must be a function');
-  }
-}`
-  });
-}
-
-function HandleMessage() {
-  return /*#__PURE__*/jsxRuntime.jsx(generatorReactSdk.Text, {
-    newLines: 2,
-    indent: 2,
-    children: `// Method to handle message with callback
-handleMessage(message, cb) {
-  if (cb) cb(message);
-}`
-  });
-}
-
-function SendOperation({
-  sendOperations,
-  clientName
-}) {
-  if (!sendOperations || sendOperations.length === 0) {
-    return null;
-  }
-  return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
-    children: sendOperations.map(operation => /*#__PURE__*/jsxRuntime.jsx(generatorReactSdk.Text, {
-      newLines: 2,
-      indent: 2,
-      children: `
-/**
- * Sends a ${operation.id()} message over the WebSocket connection.
- * 
- * @param {Object} message - The message payload to send. Should match the schema defined in the AsyncAPI document.
- * @param {WebSocket} [socket] - The WebSocket connection to use. If not provided, the client's own connection will be used.
- * @throws {TypeError} If message cannot be stringified to JSON
- * @throws {Error} If WebSocket connection is not in OPEN state
- */
-static ${operation.id()}(message, socket) {
-  try {
-    socket.send(JSON.stringify(message));
-  } catch (error) {
-    console.error('Error sending ${operation.id()} message:', error);
-  }
-}
-/**
- * Instance method version of ${operation.id()} that uses the client's own WebSocket connection.
- * @param {Object} message - The message payload to send
- * @throws {Error} If WebSocket connection is not established
- */
-${operation.id()}(message){
-  if(!this.websocket){
-    throw new Error('WebSocket connection not established. Call connect() first.');
-  }
-  ${clientName}.${operation.id()}(message, this.websocket);
-}
-  `
-    }))
-  });
-}
-
 function ModuleExport({
   clientName
 }) {
@@ -167,12 +45,20 @@ function ClientClass({
       children: `class ${clientName} {`
     }), /*#__PURE__*/jsxRuntime.jsx(Constructor, {
       serverUrl: serverUrl
-    }), /*#__PURE__*/jsxRuntime.jsx(Connect, {
+    }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.Connect, {
+      language: "javascript",
       title: title
     }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.RegisterMessageHandler, {
       language: "javascript",
       methodParams: ['handler']
-    }), /*#__PURE__*/jsxRuntime.jsx(RegisterErrorHandler, {}), /*#__PURE__*/jsxRuntime.jsx(HandleMessage, {}), /*#__PURE__*/jsxRuntime.jsx(SendOperation, {
+    }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.RegisterErrorHandler, {
+      language: "javascript",
+      methodParams: ['handler']
+    }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.HandleMessage, {
+      language: "javascript",
+      methodParams: ['message', 'cb']
+    }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.SendOperations, {
+      language: "javascript",
       sendOperations: sendOperations,
       clientName: clientName
     }), /*#__PURE__*/jsxRuntime.jsx(generatorComponents.CloseConnection, {