From 6d09389f95460c6b9faf3d80a8fe046e0adf7030 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Thu, 19 Sep 2024 09:36:48 -0700
Subject: [PATCH] grpc-js: Fix duration parsing bug

---
 packages/grpc-js/src/duration.ts       |  2 +-
 packages/grpc-js/test/test-duration.ts | 50 ++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 packages/grpc-js/test/test-duration.ts

diff --git a/packages/grpc-js/src/duration.ts b/packages/grpc-js/src/duration.ts
index 0bda0216b..b0aefde8e 100644
--- a/packages/grpc-js/src/duration.ts
+++ b/packages/grpc-js/src/duration.ts
@@ -43,6 +43,6 @@ export function parseDuration(value: string): Duration | null {
   }
   return {
     seconds: Number.parseInt(match[1], 10),
-    nanos: Number.parseInt(match[2].padEnd(9, '0'), 10)
+    nanos: match[2] ? Number.parseInt(match[2].padEnd(9, '0'), 10) : 0
   };
 }
diff --git a/packages/grpc-js/test/test-duration.ts b/packages/grpc-js/test/test-duration.ts
new file mode 100644
index 000000000..6d06c128f
--- /dev/null
+++ b/packages/grpc-js/test/test-duration.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import * as assert from 'assert';
+import * as duration from '../src/duration';
+
+describe('Duration', () => {
+  describe('parseDuration', () => {
+    const expectationList: {
+      input: string,
+      result: duration.Duration | null
+    }[] = [
+      {
+        input: '1.0s',
+        result: { seconds: 1, nanos: 0 }
+      },
+      {
+        input: '1.5s',
+        result: { seconds: 1, nanos: 500_000_000 }
+      },
+      {
+        input: '1s',
+        result: { seconds: 1, nanos: 0 }
+      },
+      {
+        input: '1',
+        result: null
+      }
+    ];
+    for (const {input, result} of expectationList) {
+      it(`${input} -> ${JSON.stringify(result)}`, () => {
+        assert.deepStrictEqual(duration.parseDuration(input), result);
+      });
+    }
+  });
+});