Merge pull request #11 from KeetaPay/release/v1.1.6

Release: v1.1.6

Author: sephynox

.cargo-husky/hooks/pre-commit

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 yarn lint-staged
 cargo fmt
 cargo clippy --fix --allow-staged
-cargo doc --no-deps
+cargo doc --no-deps

.cargo-husky/hooks/pre-push

@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 cargo test --all
 yarn build
-yarn test
+yarn test

Cargo.toml

@@ -2,22 +2,22 @@
 authors = ["Tanveer Wahid <twahid@keeta.com>"]
 edition = "2021"
 name = "asn1-napi-rs"
-version = "1.1.5"
+version = "1.1.6"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
 napi = {version = "2.12.6", features = ["chrono_date", "error_anyhow", "napi7"] }
 phf = { version = "0.11.1", features = ["macros"] }
-napi-derive = "2.11.0"
-rasn = "0.6.1"
+napi-derive = "2.12.5"
+rasn = "0.7.0"
 num-bigint = "0.4.3"
-chrono = "0.4.22"
+chrono = "0.4.24"
 base64 = "0.13.0"
 hex = "0.4.3"
-anyhow = "1.0.65"
-thiserror = "1.0.37"
+anyhow = "1.0.71"
+thiserror = "1.0.40"
 
 [dev-dependencies.cargo-husky]
 version = "1.5.0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keetapay/asn1-napi-rs",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "homepage": "https://github.com/KeetaPay/asn1-napi-rs#readme",
   "author": "Tanveer Wahid <twahid@keeta.com>",
   "description": "KeetaPay ASN.1 TypeScript-Rust NAPI library",

src/asn1.rs

@@ -429,7 +429,7 @@ mod test {
             ASN1Data::Integer(456),
             ASN1Data::Integer(123),
             ASN1Data::Date(DateTime::<FixedOffset>::from(
-                Utc.ymd(2022, 6, 22).and_hms_milli(18, 18, 0, 210),
+                Utc.timestamp_millis_opt(1655921880210).unwrap(),
             )),
             ASN1Data::Bytes(
                 hex::decode(
@@ -493,10 +493,10 @@ mod test {
                 ]),
                 ASN1Data::Array(vec![
                     ASN1Data::Date(DateTime::<FixedOffset>::from(
-                        Utc.ymd(2022, 11, 03).and_hms_milli(1, 29, 58, 0),
+                        Utc.with_ymd_and_hms(2022, 11, 03, 1, 29, 58).unwrap(),
                     )),
                     ASN1Data::Date(DateTime::<FixedOffset>::from(
-                        Utc.ymd(2027, 05, 11).and_hms_milli(1, 29, 58, 0),
+                        Utc.with_ymd_and_hms(2027, 05, 11, 1, 29, 58).unwrap(),
                     )),
                 ]),
                 ASN1Data::Array(vec![
@@ -623,7 +623,7 @@ mod test {
 
         assert_eq!(
             obj.into_date().unwrap(),
-            Utc.ymd(2022, 9, 26).and_hms_milli(10, 0, 0, 0)
+            Utc.with_ymd_and_hms(2022, 9, 26, 10, 0, 0).unwrap()
         );
     }
 

src/utils.rs

@@ -63,11 +63,15 @@ pub(crate) fn get_utc_date_time_from_asn1_milli<T: AsRef<[u8]>>(data: T) -> Resu
     };
 
     if let Ok(decoded) = decoded {
-        Ok(DateTime::<FixedOffset>::from_utc(
-            NaiveDateTime::parse_from_str(&decoded, format)?,
-            FixedOffset::east(0),
-        )
-        .with_timezone(&Utc))
+        if let Some(offset) = FixedOffset::east_opt(0) {
+            Ok(DateTime::<FixedOffset>::from_utc(
+                NaiveDateTime::parse_from_str(&decoded, format)?,
+                offset,
+            )
+            .with_timezone(&Utc))
+        } else {
+            bail!(ASN1NAPIError::MalformedData)
+        }
     } else {
         bail!(ASN1NAPIError::MalformedData)
     }
@@ -82,12 +86,15 @@ pub(crate) fn get_fixed_date_from_js(data: JsUnknown) -> Result<DateTime<FixedOf
     let timestamp = js_date.value_of()? as i64;
     let ts_secs = timestamp / 1000;
     let ts_ns = ((timestamp % 1000) * 1_000_000) as u32;
-    let naive = NaiveDateTime::from_timestamp(ts_secs, ts_ns);
 
-    Ok(DateTime::<FixedOffset>::from_utc(
-        naive,
-        FixedOffset::east(0),
-    ))
+    if let (Some(datetime), Some(offset)) = (
+        NaiveDateTime::from_timestamp_opt(ts_secs, ts_ns),
+        FixedOffset::east_opt(0),
+    ) {
+        Ok(DateTime::<FixedOffset>::from_utc(datetime, offset))
+    } else {
+        bail!(ASN1NAPIError::MalformedData)
+    }
 }
 
 /// Get an ASN1 boolean from a JsUnknown.
@@ -201,14 +208,14 @@ mod test {
 
     #[test]
     fn test_get_utc_date_time_from_asn1_milli() {
-        let date = Utc.ymd(2022, 6, 22).and_hms_milli(18, 18, 0, 210);
+        let date = Utc.timestamp_millis_opt(1655921880210).unwrap();
         let input = [
             24, 19, 50, 48, 50, 50, 48, 54, 50, 50, 49, 56, 49, 56, 48, 48, 46, 50, 49, 48, 90,
         ];
 
         assert_eq!(get_utc_date_time_from_asn1_milli(&input).unwrap(), date);
 
-        let date = Utc.ymd(2022, 9, 26).and_hms_milli(10, 0, 0, 0);
+        let date = Utc.with_ymd_and_hms(2022, 9, 26, 10, 0, 0).unwrap();
         let input = [
             24, 15, 50, 48, 50, 50, 48, 57, 50, 54, 49, 48, 48, 48, 48, 48, 90,
         ];