Skip to content

Commit

Permalink
Merge pull request #2828 from murgatroid99/grpc-js_parse_duration_fix
Browse files Browse the repository at this point in the history
grpc-js: Fix duration parsing bug
  • Loading branch information
murgatroid99 authored Sep 19, 2024
2 parents d95ea30 + 6d09389 commit 0430dc5
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 1 deletion.
2 changes: 1 addition & 1 deletion packages/grpc-js/src/duration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
}
50 changes: 50 additions & 0 deletions packages/grpc-js/test/test-duration.ts
Original file line number Diff line number Diff line change
@@ -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);
});
}
});
});

0 comments on commit 0430dc5

Please sign in to comment.