POC implementation of WAComboResponse acting directly on a socket stream #1240
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| instance creation | ||
| onStream: aStream bufferSize: anInteger codec: aGRCodec | ||
| ^ self basicNew | ||
| initializeOnStream: aStream bufferSize: anInteger codec: aGRCodec; | ||
| yourself |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,4 +4,5 @@ destroy | |
|
|
||
| super destroy. | ||
| bufferedStream := nil. | ||
| externalStream := nil. | ||
| codec := nil | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,8 @@ | ||
| public | ||
| flush | ||
| "Flush the receiver and send partial content" | ||
| committed ifFalse: [ self commit ]. | ||
|
|
||
| "Write the partial content if any" | ||
| self nextChunk: bufferedStream size put: bufferedStream contents. | ||
| bufferedStream reset |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| initialization | ||
| initializeOnStream: aStream bufferSize: anInteger codec: aGRCodec | ||
| "Initialize the receiver" | ||
|
|
||
| | rawBufferedStream | | ||
| self initialize. | ||
| codec := aGRCodec. | ||
| rawBufferedStream := GRPlatform current writeCharacterStreamOn: (aGRCodec encodedStringClass new: anInteger). | ||
| bufferedStream := aGRCodec encoderFor: rawBufferedStream. | ||
| externalStream := aStream. | ||
| committed := false. | ||
| closed := false |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,19 @@ | ||
| streaming | ||
| nextChunk: anInteger put: data | ||
| "Write a chunk of data to the external stream. Does NOT write if no data is provided since this would logically end the chunked transfer. To end data transfer use #close instead. Raise an error if the response has been committed and closed." | ||
|
|
||
| data isEmpty ifTrue: [ ^ self ]. | ||
| closed ifTrue: [ self error: 'Response is closed' ]. | ||
|
|
||
| "Per specification, write the length of the chunk as hexadecimal number. | ||
| See https://httpwg.org/specs/rfc7230.html#chunked.encoding" | ||
| externalStream | ||
| nextPutAll: (anInteger printStringBase: 16) asByteArray; | ||
| "crlf" | ||
| nextPut: 13; | ||
| nextPut: 10; | ||
| nextPutAll: data; | ||
| "crlf" | ||
| nextPut: 13; | ||
| nextPut: 10; | ||
| flush |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Backtracking'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Base'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Cache'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Callbacks'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Configuration'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Document'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Exceptions'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Filter'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-HTTP'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Libraries'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Manifest'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Rendering'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-RequestHandling'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Server'! | ||
| SystemOrganization addCategory: #'Seaside-Core-Document-Elements-Seaside-Core-Utilities'! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,7 @@ | ||
| accessing | ||
| response | ||
| ^ super response ifNil: [ | ||
| response := WAComboResponse | ||
| onStream: (GRPlatform current writeCharacterStreamOn: (ByteArray new: 1024)) | ||
|
Contributor
There was a problem hiding this comment. This doesn't look right.
Member
Author
There was a problem hiding this comment. It should be something else, yes. I presume, you meant to write We have to be careful though. I remember having to fight a lot with the wrapping streams (i.e., Zinc).
Contributor
There was a problem hiding this comment.
Yes
Let's figure out the problem and solve it.
Member
Author
There was a problem hiding this comment.
|
||
| bufferSize: 1024 | ||
| codec: (GRCodec forEncoding: 'utf-8') ] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| tests | ||
| testCommit | ||
| self response | ||
| contentType: 'text/html'; | ||
| nextPutAll: 'Visit <a href="http://www.seaside.st">seaside.st</a>.'; | ||
| commit. | ||
|
|
||
| self assert: self response isCommitted |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| tests | ||
| testWithBinaryStream | ||
| ByteArray streamContents: [ :stream | | ||
| response := WAComboResponse | ||
| onStream: stream | ||
| bufferSize: 1024 | ||
| codec: (GRCodec forEncoding: 'utf-8'). | ||
|
|
||
| response | ||
| nextPut: Character space; | ||
| flush; | ||
| close ] | ||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,6 @@ | ||
| converting | ||
| responseFor: aZnRequest | ||
| ^ WAComboResponse | ||
| onStream: aZnRequest stream | ||
| bufferSize: 4096 | ||
| codec: self codec |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.