Enabled E2E test for Typescript

.github/workflows/release.yml

@@ -61,6 +61,19 @@ jobs:
         run: |
           npm install
           npm pack
+      - name: verify example codes (ts)
+        run: |
+          kubectl port-forward statefulset/vald-agent-ngt 8081:8081 &
+          pid=$!
+
+          version=`make vald/client/node/version/print`
+          npm install -g ts-node
+
+          cd example-ts
+          npm install ../vald-client-node-${version}.tgz -s -f
+          DIM=300 ts-node example.ts
+
+          kill $pid
       - name: verify example codes (js)
         run: |
           version=`make vald/client/node/version/print`
@@ -71,19 +84,6 @@ jobs:
           DIM=300 node example.js
 
           kill $pid
-      # - name: verify example codes (ts)
-      #   run: |
-      #     kubectl port-forward statefulset/vald-agent-ngt 8081:8081 &
-      #     pid=$!
-      #
-      #     version=`make vald/client/node/version/print`
-      #     npm install -g ts-node
-      #
-      #     cd example-ts
-      #     npm install ../vald-client-node-${version}.tgz -s -f
-      #     DIM=300 ts-node example.ts
-      #
-      #     kill $pid
   publish:
     if: startsWith( github.ref, 'refs/tags/')
     needs:

buf.gen.yaml

@@ -2,13 +2,6 @@ version: v1
 managed:
   enabled: true
 plugins:
-  # - plugin: buf.build/protocolbuffers/js
-  #   out: src/
-  #   opt: import_style=commonjs
-  # - plugin: buf.build/grpc/node
-  #   out: src
-  #   opt: grpc_js,import_style=commonjs
-
   - plugin: buf.build/community/timostamm-protobuf-ts
     out: src
     # https://github.com/timostamm/protobuf-ts/blob/main/MANUAL.md#the-protoc-plugin
@@ -22,16 +15,3 @@ plugins:
       - output_javascript
       - output_legacy_commonjs
       - eslint_disable
-
-    # Failed because timeout type changed
-    # opt:
-    #   - add_pb_suffix
-    #   - client_grpc1
-    #   - generate_dependencies
-    #   - keep_enum_prefix
-    #   - ts_nocheck
-    #   - use_proto_field_name
-    #   - output_javascript
-    #   - optimize_code_size
-    #   - long_type_string
-    #   - eslint_disable

example-ts/example.ts

@@ -1,5 +1,6 @@
 import * as grpc from "@grpc/grpc-js";
 import { v1_vald, v1_payload } from "vald-client-node";
+import type { Insert_Request, Search_Request, Remove_Request } from "vald-client-node/src/vald/v1/payload/payload_pb";
 
 const addr = "localhost:8081";
 const DIM = process.env.DIM || 4;
@@ -38,7 +39,7 @@ const main = async () => {
     grpc.credentials.createInsecure()
   );
 
-  const insertFunc = (req: any) => {
+  const insertFunc = async (req: Insert_Request) => {
     return new Promise((resolve, reject) => {
       iclient.insert(req, (err, resp) => {
         if (err) {
@@ -49,13 +50,13 @@ const main = async () => {
       });
     });
   };
-  insertFunc(ireq)
-    .then(async (res) => {
-      console.log("resp: ", res);
+  await insertFunc(ireq)
+    .then((res) => {
+      console.log("insert resp: ", res);
     })
     .catch((e) => {
       console.log("err: ", e);
-      return -1;
+      process.exit(1);
     });
 
   const second = 100;
@@ -79,7 +80,7 @@ const main = async () => {
     grpc.credentials.createInsecure()
   );
 
-  const searchFunc = (req: any) => {
+  const searchFunc = async (req: Search_Request) => {
     return new Promise((resolve, reject) => {
       sclient.search(req, (err, resp) => {
         if (err) {
@@ -90,13 +91,13 @@ const main = async () => {
       });
     });
   };
-  searchFunc(sreq)
-    .then((res: any) => {
-      console.log("res: ", res, "\n");
+  await searchFunc(sreq)
+    .then((res) => {
+      console.log("search res: ", res, "\n");
     })
     .catch((e) => {
       console.log("err: ", e);
-      return -1;
+      process.exit(1);
     });
 
   // remove
@@ -117,7 +118,7 @@ const main = async () => {
     grpc.credentials.createInsecure()
   );
 
-  const removeFunc = (req: any) => {
+  const removeFunc = async (req: Remove_Request) => {
     return new Promise((resolve, reject) => {
       rclient.remove(req, (err, resp) => {
         if (err) {
@@ -128,14 +129,15 @@ const main = async () => {
       });
     });
   };
-  removeFunc(rreq)
-    .then((res: any) => {
-      console.log("res: ", res, "\n");
+  await removeFunc(rreq)
+    .then((res) => {
+      console.log("remove res: ", res, "\n");
     })
     .catch((e) => {
       console.log("err: ", e);
-      return -1;
+      process.exit(1);
     });
+  process.exit(0);
 };
 
 main();

example-ts/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "target": "es2020",
+    "module": "commonjs",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true
+  }
+}

index.d.ts

@@ -1,9 +1,9 @@
 import v1_agent_core = require("./src/vald/v1/agent/core");
-import v1_payload = require("./src/vald/v1/payload");
 import v1_vald = require("./src/vald/v1/vald");
+import v1_payload = require("./src/vald/v1/payload");
 declare const _default: {
     v1_agent_core: typeof v1_agent_core,
-    v1_payload: typeof v1_payload,
     v1_vald: typeof v1_vald,
+    v1_payload: typeof v1_payload,
 };
 export = _default;

index.js

@@ -1,3 +1,3 @@
 module.exports.v1_agent_core = require("./src/vald/v1/agent/core");
-module.exports.v1_payload = require("./src/vald/v1/payload");
 module.exports.v1_vald = require("./src/vald/v1/vald");
+module.exports.v1_payload = require("./src/vald/v1/payload");