use native parseCubestoreResultMessage

Author: KSDaemon

packages/cubejs-cubestore-driver/package.json

@@ -29,6 +29,7 @@
     "@cubejs-backend/base-driver": "1.1.7",
     "@cubejs-backend/cubestore": "1.1.7",
     "@cubejs-backend/shared": "1.1.7",
+    "@cubejs-backend/native": "1.1.7",
     "csv-write-stream": "^2.0.0",
     "flatbuffers": "23.3.3",
     "fs-extra": "^9.1.0",

packages/cubejs-cubestore-driver/src/WebSocketConnection.ts

@@ -1,14 +1,13 @@
 import WebSocket from 'ws';
 import * as flatbuffers from 'flatbuffers';
+import { v4 as uuidv4 } from 'uuid';
 import { InlineTable } from '@cubejs-backend/base-driver';
 import { getEnv } from '@cubejs-backend/shared';
-import { v4 as uuidv4 } from 'uuid';
+import { parseCubestoreResultMessage } from '@cubejs-backend/native';
 import {
   HttpCommand,
-  HttpError,
   HttpMessage,
   HttpQuery,
-  HttpResultSet,
   HttpTable
 } from '../codegen';
 
@@ -116,44 +115,12 @@ export class WebSocketConnection {
           if (!resolvers) {
             throw new Error(`Cube Store missed message id: ${httpMessage.messageId()}`); // logging
           }
-          const commandType = httpMessage.commandType();
-          if (commandType === HttpCommand.HttpError) {
-            resolvers.reject(new Error(`${httpMessage.command(new HttpError())?.error()}`));
-          } else if (commandType === HttpCommand.HttpResultSet) {
-            const resultSet = httpMessage.command(new HttpResultSet());
-            if (!resultSet) {
-              resolvers.reject(new Error('Empty resultSet'));
-              return;
-            }
-            const columnsLen = resultSet.columnsLength();
-            const columns: Array<string> = [];
-            for (let i = 0; i < columnsLen; i++) {
-              const columnName = resultSet.columns(i);
-              if (!columnName) {
-                resolvers.reject(new Error('Column name is not defined'));
-                return;
-              }
-              columns.push(columnName);
-            }
-            const rowLen = resultSet.rowsLength();
-            const result: any[] = [];
-            for (let i = 0; i < rowLen; i++) {
-              const row = resultSet.rows(i);
-              if (!row) {
-                resolvers.reject(new Error('Null row'));
-                return;
-              }
-              const valueLen = row.valuesLength();
-              const rowObj = {};
-              for (let j = 0; j < valueLen; j++) {
-                const value = row.values(j);
-                rowObj[columns[j]] = value?.stringValue();
-              }
-              result.push(rowObj);
-            }
-            resolvers.resolve(result);
-          } else {
-            resolvers.reject(new Error('Unsupported command'));
+
+          try {
+            const nativeResMsg = parseCubestoreResultMessage(msg);
+            resolvers.resolve(nativeResMsg);
+          } catch (e) {
+            resolvers.reject(e);
           }
         });
       });