fixed PWFT issue in remove

Merge multistage send development branch

client.go

@@ -1,7 +1,7 @@
 // =============================================================================
 // Auth: alex
 // File: client.go
-// Revn: 06-14-2024  3.0
+// Revn: 01-09-2025  4.0
 // Func: ask server for a message of the day quote
 //
 // TODO: remove ioutil import
@@ -33,6 +33,7 @@
 //             STARTED BYTE-BASED PWFT REWRITE
 //*06-14-2024: finished byte-based PWFT rewrite
 //             commented
+//*01-09-2025: basically just copy/pasted from /la/ into /r1/, /r2/
 //
 // =============================================================================
 
@@ -226,8 +227,47 @@ func handle( conn net.Conn ) {
         // to remove. There was probably a way to handle this a little
         // more simply, but this, I feel, has some nuance to it that I
         // actually like
-            // redo /la/, list all quotes
+            // redo /r1/, list all quotes
             // split recv'd message over newline to create quote list
+            if len( msg ) > 2 {     // multistage send condition
+                if msg[1] == "X" {      // final message
+                    // TODO update
+                    // read entire temp storage file as byte array
+                    tfile, err := ioutil.ReadFile( "temp.q" )
+                    check( err )    // check read for errors
+                    // cast file to string, concat with recv'd string
+                    tstr := string( tfile ) + msg[2]
+                    // split concat over newlines, separating quotes
+                    tlist := strings.Split( tstr, "\n" )
+                    // iterate over array, printing each quote
+                    for p, v := range tlist {
+                        fmt.Println( p + 1, "\t", v )
+                    }
+                    // delete temp storage file
+                    err = os.Remove( "temp.q" )
+                    check( err )    // check rm for errors
+                    // ask user which quote to remove
+                    resp = "r2@" + in( "\n-> " )
+                } else {    // first or intermediate message
+                    // open temp quote storage file, creating if
+                    // necessary, with write-only permissions, in
+                    // append mode, wr u perm, r g/w perm
+                    f, err := os.OpenFile( "temp.q", os.O_WRONLY | os.O_APPEND | os.O_CREATE, 0644 )
+                    check( err )    // check file open for errors
+                    // write received message to file, keeping track
+                    // of bytes written
+                    n, err = f.WriteString( msg[2] )
+                    check( err )    // check file write for errors
+                    // cast bytes already written field to int
+                    b, err := strconv.Atoi( msg[1] )
+                    check( err )    // check cast for errors
+                    // add bytes just written to bytes already
+                    // written, cast back to string, and append to
+                    // response variable
+                    resp = "r1@" + strconv.Itoa( b + n )
+                }
+            } else {
+                // split recv'd message over \n, create quote list
                 quotes := strings.Split( msg[1], "\n" )
                 for p, v := range quotes {      // iterate over quotes
                     // print num of quote, followed by that quote
@@ -235,19 +275,26 @@ func handle( conn net.Conn ) {
                 }
                 // ask user which quote to remove
                 resp = "r2@" + in( "\n-> " )
+            }
         case "r2":      // /r2/, remove ( second transaction )
             // if server says remove succeeded
             if msg[1] == "success" {
                 fmt.Println( "Remove successful\n" )    // success
                 // list all quotes to validate remove succeeded
                 // TODO should /aa/ also make /lr/ before /te/?
-                resp = "lr@dumvar"  // set transaction end message
+                resp = "lr@init"    // set transaction end message
             // if server says remove failed
             } else if msg[1] == "error" {
                 fmt.Println( "Remove failed" )      // print failure
                 resp = "te@error"   // set transaction end message
             // if unknown status message
             } else {
+                // TODO there's a known issue where if the buffer
+                // size ( -s ) is less than 10, on the server side,
+                // 'success' will get cut off ( r2@success )
+                // and /r2/ will end up down here despite having
+                // actually worked correctly, and with not display the
+                // list, as it should on success
                 // print unknown status
                 fmt.Println( "Unknown error code: " + msg[1] )
                 // TODO should this be unknown instead of error?
@@ -338,7 +385,7 @@ func main() {
                 _, rerr := strconv.Atoi( flag.Args()[0] )
                 // if there was an error, just pretend there's no args
                 if rerr != nil {
-                    command = "r1@dumvar"   // remove request 1
+                    command = "r1@init"     // remove request 1
                     // TODO come up w/ useful argument, replace dumvar
                 } else {
                     // if user knows the number, take care of it
@@ -348,7 +395,7 @@ func main() {
                 }
             } else {    // if no argument was specified for remove
                 // jump right into remove request 1
-                command = "r1@dumvar"
+                command = "r1@init"
             }
         default:    // if no flag was specified
             // begin transaction for quote request

server.go

@@ -1,11 +1,10 @@
 // =============================================================================
 // Auth: alex
 // File: server.go
-// Revn: 06-14-2024  4.0
+// Revn: 01-09-2025  5.0
 // Func: host MOTD connection
 //
-// TODO: catch keyboard int. signal
-//       remove ioutil import
+// TODO: remove ioutil import
 //       add more /codes/ to handle
 //       add flags, like specify port
 //       write usage and errors to logfile
@@ -43,6 +42,8 @@
 // 06-13-2024: removed debug print statements
 //             commented
 //*06-14-2024: byte count-based PWFT rewrite
+//*06-17-2024: catch keyboard interrupts with os/signal and syscall
+//*01-09-2025: copied lr/la PWFT updates into r1/r2
 //
 // =============================================================================
 
@@ -55,9 +56,11 @@ import (
     "io/ioutil" // ReadFile
     "net"       // ResovleTCPAddr, ListenTCP, listener.Accept
                 // conn.Read,Write
-    "os"        // Exit
-    "strconv"   // Itoa
+    "os"        // Exit, Create, os.Signal
+    "os/signal" // Notify
+    "strconv"   // Itoa, Atoi
     "strings"   // Split
+    "syscall"   // syscall.SIGINT,SIGTERM
 )
 
 
@@ -206,7 +209,7 @@ func handle( conn net.Conn ) {
                     } else {
                         // get slice from start index to end, concat
                         // with response
-                        resp = resp + qfile[num:end]
+                        resp = resp + qfile[bytes:end]
                     }
                 }
             } else {    // file is smaller than the tx size
@@ -221,8 +224,42 @@ func handle( conn net.Conn ) {
             writeFile( qfile )
             resp = "aa@success"     // add answer
         case "r1":      // /r1/, remove request 1
-            // same as list, just send whole file
-            resp = "r1@" + qfile    // remove request 1
+            resp = "r1@"    // begin crafting response
+            // file too big for single transmission
+            // initial header size is 5, r1@1@, so counting that into
+            // the transmission size, the file must be longer than 251
+            // ( default ) bytes to reach this block of code
+            if len( qfile ) > ( tsize - 5 ) {
+                if command[1] == "init" {   // first request
+                    // add message number, delim, and the first
+                    // transmittable bytes
+                    resp = resp + "0@" + qfile[:( tsize - 5 )]
+                } else {    // subsequent requests
+                    // convert byte count to int
+                    bytes, err := strconv.Atoi( command[1] )
+                    check( err )    // make sure convert worked
+                    // replace tx'd bytes and delim to new header
+                    resp = resp + command[1] + "@"
+                    rlen := len( resp )     // capture header length
+                    // slices are always of size "txsize - header
+                    // length", so find end byte
+                    end := bytes + ( tsize - rlen )
+                    // if end goes beyond the bounds of the list
+                    if end > len( qfile ) {
+                        // replace byte count  with X to signal
+                        // final message, concat the rest of the file,
+                        // beginning with the start index
+                        resp = "r1@X@" + qfile[bytes:]
+                    } else {
+                        // get slice from start index to end, concat
+                        // with response
+                        resp = resp + qfile[bytes:end]
+                    }
+                }
+            } else {    // file is smaller than the tx size
+                // just concat entire list to send
+                resp = resp + qfile    // list answer
+            }
         case "r2":      // /r2/, remove request 2
             // convert message argument to string to make sure it's a
             // valid number
@@ -268,6 +305,11 @@ func handle( conn net.Conn ) {
                         writeFile( qfile )  // write back to file
                         // let client know remove was successful
                         resp = "r2@success"
+                        // TODO for buffer sizes ( -s ) below 10, this
+                        // will cause a soft error on the other end
+                        // if it's less than 10, 'success' gets cut
+                        // off and client doesn't register it as an
+                        // actual success
                 }
             }
         case "te":      // /te/, transaction end
@@ -298,6 +340,11 @@ var tsize int           // size of transmission buffer
 // main, create port and wait for connection
 func main() {
 
+    // create buffered channel for catching keyboard interrupt signal
+    sigs := make( chan os.Signal, 1 )
+    // set interrupt and terminate signals to notify channel
+    signal.Notify( sigs, syscall.SIGINT, syscall.SIGTERM )
+
     // flag for default transmission size
     flag.IntVar( &tsize, "s", 256, "transmission size ( bytes )" )
     flag.Parse()
@@ -313,15 +360,19 @@ func main() {
     // create listener object from ip:port
     listener, err := net.ListenTCP( "tcp", addr )
 
+    go func() {     // keyboard interrupt thread
+        // print kill message
+        fmt.Println( "press ctrl+C to stop..." )
+        <- sigs     // blocking read of signal from channel
+        fmt.Println( "\nexiting" )  // exit message
+        os.Exit( 0 )    // exeunt
+    }()
+
     for {
         // wait, create connection when found
         conn, err := listener.Accept()
         check( err )    // make sure connection works
-    
         go handle( conn )  // handle connection
     }
-
-    os.Exit( 0 )    // exeunt
-
 }