Revert "refactor: get iris_api_id by read custom header comments"

This reverts commit 09c00c7.
AgoraIO-Extensions · Jan 22, 2024 · c5fb5cd · c5fb5cd
1 parent 09c00c7
commit c5fb5cd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 73 deletions.
diff --git a/headers/rtc_4.3.0/custom_headers/CustomIAgoraRtcEngine.h b/headers/rtc_4.3.0/custom_headers/CustomIAgoraRtcEngine.h
@@ -102,10 +102,8 @@ class IRtcEngine {
   virtual int addVideoWatermark(const char *watermarkUrl,
                                 const WatermarkOptions &options) = 0;
 
-  /**
-   * @iris_api_id: RtcEngine_joinChannelWithUserAccount_4685af9
-   * @source: virtual int joinChannelWithUserAccount(const char* token, const char* channelId, const char* userAccount, const ChannelMediaOptions& options) = 0;
-   */
+  // virtual int joinChannelWithUserAccount(const char* token, const char* channelId,
+  //                                        const char* userAccount, const ChannelMediaOptions& options) = 0;
   virtual int
   joinChannelWithUserAccount(const char *token, const char *channelId,
                              const char *userAccount,

diff --git a/src/parsers/add_node_parser.ts b/src/parsers/add_node_parser.ts
@@ -9,16 +9,7 @@ import {
 } from '@agoraio-extensions/cxx-parser';
 import { ParseResult, TerraContext } from '@agoraio-extensions/terra-core';
 
-import { irisApiId } from '../utils';
-import {
-  CommentAction,
-  CommentConfig,
-  CommentConfigKey,
-  generateNodes,
-  getConfigsFromComments,
-} from '../utils/parser_utils';
-
-import { IrisApiIdParserUserData } from './iris_api_id_parser';
+import { generateNodes } from '../utils/parser_utils';
 
 export type AddNodeParserArgs = CXXParserConfigs & {
   customHeaderFileNamePrefix?: string;
@@ -72,40 +63,17 @@ export const AddNodeParser = (
       }
 
       (customNode as Clazz).methods.forEach((customMethod) => {
-        let configs: CommentConfig[] = getConfigsFromComments(customMethod);
-        let foundMethodIndex = -1;
-        let irisApiIdValue = '';
-        for (let config of configs) {
-          switch (config.key) {
-            case CommentConfigKey.SOURCE:
-              // find method which has same name and signature
-              foundMethodIndex = foundClass.methods.findIndex(
-                (it) => it.name === customMethod.name
-              );
-              break;
-            case CommentConfigKey.IRIS_API_ID:
-              // find method which has same name and signature
-              irisApiIdValue = config.value;
-              break;
-          }
-        }
-        if (customMethod.name === 'joinChannelWithUserAccount') {
-          debugger;
-        }
+        // find method which has same name
+        const foundMethodIndex = foundClass.methods.findIndex(
+          (it) => it.name === customMethod.name
+        );
         if (foundMethodIndex == -1) {
           // add method if not found
           foundClass.methods.push(customMethod);
           return;
         }
 
         // mark method as custom
-        // iris use nativeSDK origin cpp api signature, so we need call applyIrisApiId to add iris api id by foundClass.methods[foundMethodIndex]
-        customMethod.user_data ??= {};
-        (customMethod.user_data as IrisApiIdParserUserData).IrisApiIdParser = {
-          key: '',
-          value: irisApiIdValue,
-        };
-
         customMethod.user_data = {
           ...customMethod.user_data,
           AddNodeParser: foundClass.methods[foundMethodIndex],

diff --git a/src/utils/parser_utils.ts b/src/utils/parser_utils.ts
@@ -1,8 +1,4 @@
-import {
-  CXXParser,
-  CXXParserConfigs,
-  CXXTerraNode,
-} from '@agoraio-extensions/cxx-parser';
+import { CXXParser, CXXParserConfigs } from '@agoraio-extensions/cxx-parser';
 import {
   ParseResult,
   TerraContext,
@@ -39,30 +35,3 @@ export function getConfigs(args: BaseParserArgs, terraContext: TerraContext) {
   }
   return configs;
 }
-
-export enum CommentConfigKey {
-  SOURCE = 'source',
-  ACTION = 'action',
-  IRIS_API_ID = 'iris_api_id',
-}
-
-export enum CommentAction {
-  ADD = 'add',
-  REPLACE = 'replace',
-  REMOVE = 'remove',
-}
-
-export type CommentConfig = { key: CommentConfigKey; value: string };
-
-export const getConfigsFromComments = (node: CXXTerraNode) => {
-  const regex = /@(\w+):(.+?)(?=@|$)/gs;
-  const matches = [...node.comment.matchAll(regex)];
-  const configs: CommentConfig[] = matches.map((match) => {
-    return {
-      key: match[1] as CommentConfigKey,
-      value: match[2].trim(),
-    };
-  });
-  node.comment = '';
-  return configs;
-};