Minor improvements from testing against NFSv4

Author: fridvin-netapp

__test__/index.spec.js

@@ -1062,6 +1062,17 @@ ava_1.default.serial('should succeed when seeking and writing string object via
     t.is(text, 'hello world');
     await rootHandle.removeEntry(fileHandle.name);
 });
+ava_1.default.serial('should succeed when seeking beyond file size and writing string via write', async (t) => {
+    const rootHandle = getRootHandle();
+    const fileHandle = await rootHandle.getFileHandle('writable-seek-and-write-string-via-write', { create: true });
+    const writable = await fileHandle.createWritable();
+    await t.notThrowsAsync(writable.write({ type: 'write', position: 4, data: 'abc' }));
+    const file = await fileHandle.getFile();
+    t.is(file.size, 7);
+    const text = await file.text();
+    t.is(text, '\0\0\0\0abc');
+    await rootHandle.removeEntry(fileHandle.name);
+});
 ava_1.default.serial('should succeed when truncating size', async (t) => {
     const rootHandle = getRootHandle();
     const fileHandle = await rootHandle.getFileHandle('writable-truncate', { create: true });

__test__/index.spec.ts

@@ -1160,6 +1160,18 @@ test.serial('should succeed when seeking and writing string object via write', a
   await rootHandle.removeEntry(fileHandle.name);
 })
 
+test.serial('should succeed when seeking beyond file size and writing string via write', async (t) => {
+  const rootHandle = getRootHandle();
+  const fileHandle = await rootHandle.getFileHandle('writable-seek-and-write-string-via-write', {create: true}) as NfsFileHandle;
+  const writable = await fileHandle.createWritable();
+  await t.notThrowsAsync(writable.write({type: 'write', position: 4, data: 'abc'}));
+  const file = await fileHandle.getFile();
+  t.is(file.size, 7);
+  const text = await file.text();
+  t.is(text, '\0\0\0\0abc');
+  await rootHandle.removeEntry(fileHandle.name);
+})
+
 test.serial('should succeed when truncating size', async (t) => {
   const rootHandle = getRootHandle();
   const fileHandle = await rootHandle.getFileHandle('writable-truncate', {create: true}) as NfsFileHandle;

setup-nfs-testdir.sh

@@ -28,6 +28,7 @@ if [ -z $NFS_GID ]; then
     NFS_GID=nogroup
 fi
 
+rm -rf ${NFS_TEST_DIR}/*
 mkdir -p ${NFS_TEST_DIR}/first ${NFS_TEST_DIR}/quatre
 echo -n "In order to make sure that this file is exactly 123 bytes in size, I have written this text while watching its chars count." > ${NFS_TEST_DIR}/annar
 touch ${NFS_TEST_DIR}/3 ${NFS_TEST_DIR}/first/comment ${NFS_TEST_DIR}/quatre/points

src/lib.rs

@@ -339,7 +339,8 @@ pub struct JsNfsHandle {
 impl JsNfsHandle {
 
   pub fn open(url: String) -> Self {
-    Self{nfs: Some(Arc::new(RwLock::new(nfs::connect(url)))), path: DIR_ROOT.into(), kind: KIND_DIRECTORY.into(), name: DIR_ROOT.into()}
+    let my_nfs = nfs::connect(url).unwrap_or_else(|e| panic!("error opening connection to NFS server: {:?}", e));
+    Self{nfs: Some(Arc::new(RwLock::new(my_nfs))), path: DIR_ROOT.into(), kind: KIND_DIRECTORY.into(), name: DIR_ROOT.into()}
   }
 
   fn is_same(&self, other: &JsNfsHandle) -> bool {
@@ -652,7 +653,8 @@ impl JsNfsFileHandle {
     let nfs = &self.handle.nfs;
     let my_nfs = nfs.as_ref().unwrap().write().unwrap();
     let nfs_stat = my_nfs.stat64(self.handle.path.as_str())?;
-    Ok(JsNfsFile{handle: self.handle.clone(), size: nfs_stat.size as i64, type_, last_modified: (nfs_stat.mtime * 1000) as i64, name: self.name.clone()})
+    let last_modified = (nfs_stat.mtime as i64).checked_mul(1000).unwrap_or(nfs_stat.mtime as i64);
+    Ok(JsNfsFile{handle: self.handle.clone(), size: nfs_stat.size as i64, type_, last_modified, name: self.name.clone()})
   }
 
   #[napi]

src/nfs/libnfs.rs

@@ -28,10 +28,10 @@ pub(super) struct NFS3 {
 }
 
 impl NFS3 {
-    pub(super) fn connect(url: String) -> Box<dyn NFS> {
-        let mut nfs = Nfs::new().unwrap();
-        let _ = nfs.parse_url_mount(url.as_str()).unwrap();
-        Box::new(NFS3{nfs: Arc::new(RwLock::new(nfs))})
+    pub(super) fn connect(url: String) -> Result<Box<dyn NFS>> {
+        let mut nfs = Nfs::new()?;
+        let _ = nfs.parse_url_mount(url.as_str())?;
+        Ok(Box::new(NFS3{nfs: Arc::new(RwLock::new(nfs))}))
     }
 }
 

src/nfs/mod.rs

@@ -122,11 +122,11 @@ pub struct NFSStat64 {
   pub ctime_nsec: u64,
 }
 
-pub(crate) fn connect(url: String) -> Box<dyn NFS> {
+pub(crate) fn connect(url: String) -> Result<Box<dyn NFS>> {
     if std::env::var("TEST_USING_MOCKS").is_ok() {
-        mock::NFS3::connect(url)
+        Ok(mock::NFS3::connect(url))
     } else if std::env::var("TEST_USING_PURE_RUST").is_ok() {
-        nfs_rs::NFS3::connect(url)
+        Ok(nfs_rs::NFS3::connect(url))
     } else {
         libnfs::NFS3::connect(url)
     }