Jp/webside module

.gitattributes

@@ -0,0 +1,2 @@
+*.st text linguist-language=Smalltalk
+

image-segments/.gitignore

@@ -1,2 +1,6 @@
 *.json
 *.ems
+*.so
+*.dll
+*.dylib
+

modules/Examples/HTTPServer/HTTPServerModule.st

@@ -10,8 +10,8 @@ Class {
 { #category : #spec }
 HTTPServerModule >> imports [
 	^{
-		#'HTTP.CPPHTTPServer' -> #(HTTPServer).
 		#FFI -> #(ExternalLibrary).
+		#'HTTP.CPPHTTPServer' -> #(HTTPServer).
 	}
 ]
 
@@ -32,7 +32,7 @@ HTTPServerModule >> main: arguments [
 	base := arguments at: 3 ifAbsent: ['/egg'].
 	server := HTTPServer new.
 	server
-		routeGET: base, '/hello/:name' to: #hello with: self.
+		routeGET: base, '/hello/{name}' to: [:req :res | self handle: req into: res with: #hello].
 	Kernel log: 'server configured, starting!', String cr.
 	server start.
 	^0

modules/Examples/HTTPServer/README.md

@@ -0,0 +1,15 @@
+# HTTP Server example
+
+An example of an HTTP server based on cpp-httplib. 
+The CPPHTTPServer module contains an FFI interface to plain C wrappers
+to cpp-httplib. Here we use those wrappers to create a blocking web
+server.
+
+## Building
+
+You need to build the native cpp-httplib in HTTP/CPPHTTPServer/lib (see
+its readme), then build this module and FFI
+
+cd image-segments
+make FFI.ems FFI.Posix.ems Examples.HTTPServer.ems
+

modules/HTTP/CPPHTTPServer/HTTPRequest.st

@@ -0,0 +1,23 @@
+"
+    Copyright (c) 2024, Javier Pimás. 
+    See (MIT) license in root directory.
+"
+
+Class {
+	#name : #HTTPRequest,
+	#superclass : #ExternalObject,
+	#category : #'CPPHTTPServer'
+}
+
+{ #category : #spec }
+HTTPRequest >> paramAt: aString [
+	| addr |
+	addr := self class module library 
+		request: handle asParameter
+		paramAt: aString externalCopy asParameter.
+
+	addr = 0 ifTrue: [^nil].
+
+	"should do better and look at encoding"
+	^String fromMemory: addr pointedMemory
+]

modules/HTTP/CPPHTTPServer/HTTPServer.st

@@ -10,11 +10,11 @@ Class {
 }
 
 { #category : #spec }
-HTTPServer >> handle: requestHandle with: handler into: responseHandle with: selector [
+HTTPServer >> handle: requestHandle with: handler into: responseHandle [
 	| request response |
 	request := HTTPRequest new handle: requestHandle.
 	response := HTTPResponse new handle: responseHandle.
-	handler handle: request into: response with: selector.
+	handler evaluateWith: request with: response.
 	^responseHandle
 ]
 
@@ -29,11 +29,11 @@ HTTPServer >> library [
 ]
 
 { #category : #spec }
-HTTPServer >> routeGET: uri to: selector with: handler [
+HTTPServer >> routeGET: uri to: handler [
 	self library
 		server: self asParameter
 		GET: uri externalCopy asParameter
-		callback: [ :request :response | self handle: request with: handler into: response with: selector ] asCallback
+		callback: [ :request :response | self handle: request with: handler into: response ] asCallback
 ]
 
 { #category : #spec }

modules/HTTP/CPPHTTPServer/HTTPServerLibrary.st

@@ -29,11 +29,22 @@ HTTPServerLibrary >> newServer [
 	<cdecl: pointer Server_New()>
 ]
 
+{ #category : #server }
+HTTPServerLibrary >> server: aServer DELETE: url callback: aCallback [
+	<cdecl: void Server_Delete(pointer, pointer, pointer)>
+]
+
 { #category : #server }
 HTTPServerLibrary >> server: aServer GET: url callback: aCallback [
 	<cdecl: void Server_Get(pointer, pointer, pointer)>
 ]
 
+{ #category : #server }
+HTTPServerLibrary >> server: aServer POST: url callback: aCallback [
+	<cdecl: void Server_Post(pointer, pointer, pointer)>
+]
+
+
 { #category : #server }
 HTTPServerLibrary >> startServer: aServer [
 	<cdecl: void Server_Start(pointer)>

modules/HTTP/CPPHTTPServer/README.md

@@ -23,9 +23,15 @@ egg/modules/HTTP/CPPHTTPServer/lib $
 cmake -S . -B build && cmake --build build
 ```
 
-The result should be a file called libhttpserver.so (linux), httpserver.dll (windows) or
-something similar for your platform. This file will go to the build dir, you'll have to
-copy it to some place in your egg's FFI path (simplest way: the place from where you run egg).
+The result should be a file called libhttpserver.so (linux), httpserver.dll (windows),
+httpserver.dylib or something similar for your platform. 
+This file will go to the build dir, you'll have to copy (or better, link) it to some
+place in your egg's FFI path (simplest way: the place from where you run egg).
+
+```
+egg/image-segments $
+ln -s ../modules/HTTP/CPPHTTPServer/lib/libhttpserver.so .
+```
 
 # Usage
 

modules/HTTP/CPPHTTPServer/lib/server.cpp

@@ -3,6 +3,12 @@
 
 typedef void(*server_callback)(const void *, const void *);
 
+// in our uri convention we use {var} to denote a variable, but httplib uses :var
+static std::string translateUriFormat(const std::string& uri) {
+    static const std::regex varPattern(R"(\{([a-zA-Z_][a-zA-Z0-9_]*)\})");
+    return std::regex_replace(uri, varPattern, ":$1");
+}
+
 extern "C" {
 
 void* Server_New()
@@ -14,7 +20,7 @@ void Server_Get(void *cserver, char *url, void *ccallback)
 {
     httplib::Server *server = reinterpret_cast<httplib::Server*>(cserver);
     server_callback callback = reinterpret_cast<server_callback>(ccallback);
-    server->Get(url, [callback](const httplib::Request &req, httplib::Response &res) {
+    server->Get(translateUriFormat(url), [callback](const httplib::Request &req, httplib::Response &res) {
         callback(&req, &res);
     });
 }
@@ -33,7 +39,9 @@ char* Request_ParamAt(void *creq, char *key, char *type)
 {
     httplib::Request *req = reinterpret_cast<httplib::Request*>(creq);
 
-    return (char*)req->path_params.at(key).c_str();
+    auto &params = req->path_params;
+    auto it = params.find(key);
+    return it != params.end() ? (char*)it->second.c_str() : nullptr;
 }
 
 void Response_SetContent(void *cres, char *content, char *type)

modules/JSON/BooleanAdaptor.st

@@ -0,0 +1,21 @@
+"
+	Copyright (c) 2020 Aucerna.
+	See (MIT) license in root directory.
+"
+
+Class {
+	#name : #BooleanAdaptor,
+	#superclass : #DataAdaptor,
+	#category : #JSON
+}
+
+{ #category : #services }
+BooleanAdaptor >> dataFrom: aBoolean [
+	^aBoolean ifTrue: [1] ifFalse: [0]
+]
+
+{ #category : #services }
+BooleanAdaptor >> objectFrom: anInteger [
+	^anInteger asBoolean
+]
+

modules/JSON/DataAdaptor.st

@@ -0,0 +1,28 @@
+"
+	Copyright (c) 2020 Aucerna.
+	See (MIT) license in root directory.
+"
+
+Class {
+	#name : #DataAdaptor,
+	#superclass : #Object,
+	#category : #JSON
+}
+
+{ #category : #services }
+DataAdaptor >> dataFrom: anObject [
+	^anObject asString
+]
+
+{ #category : #testing }
+DataAdaptor >> isEntityAdaptor [
+	^false
+]
+
+{ #category : #services }
+DataAdaptor >> objectFrom: aString [
+	^(aString conform: [:ch | ch isDigit or: [#($+ $- $.) includes: ch]])
+		ifTrue: [aString asNumber]
+		ifFalse: [aString]
+]
+

modules/JSON/IdAdaptor.st

@@ -0,0 +1,43 @@
+"
+	Copyright (c) 2020 Aucerna.
+	See (MIT) license in root directory.
+"
+
+Class {
+	#name : #IdAdaptor,
+	#superclass : #DataAdaptor,
+	#instVars : [
+		'selector'
+	],
+	#category : #JSON
+}
+
+{ #category : #'instance creation' }
+IdAdaptor class >> forName [
+	^self new selector: #name
+]
+
+{ #category : #services }
+IdAdaptor >> dataFrom: anObject [
+	anObject isNil ifTrue: [^nil].
+	anObject isInteger ifTrue: [^anObject].
+	anObject isString ifTrue: [^anObject].
+	^selector evaluateWith: anObject
+]
+
+{ #category : #initialization }
+IdAdaptor >> initialize [
+	super initialize.
+	selector := #id
+]
+
+{ #category : #services }
+IdAdaptor >> objectFrom: anInteger [
+	^anInteger
+]
+
+{ #category : #accessing }
+IdAdaptor >> selector: aSymbol [
+	selector := aSymbol
+]
+

modules/JSON/JsonAnySchema.st

@@ -0,0 +1,21 @@
+"
+	Copyright (c) 2020 Aucerna.
+	See (MIT) license in root directory.
+"
+
+Class {
+	#name : #JsonAnySchema,
+	#superclass : #JsonCombinedSchema,
+	#category : #JSON
+}
+
+{ #category : #accessing }
+JsonAnySchema class >> typeName [
+	^'anyOf'
+]
+
+{ #category : #testing }
+JsonAnySchema >> isAnySchema [
+	^true
+]
+

modules/JSON/JsonArraySchema.st

@@ -0,0 +1,79 @@
+"
+	Copyright (c) 2020 Aucerna.
+	See (MIT) license in root directory.
+"
+
+Class {
+	#name : #JsonArraySchema,
+	#superclass : #JsonSchema,
+	#instVars : [
+		'items',
+		'minItems',
+		'maxItems',
+		'uniqueItems'
+	],
+	#category : #JSON
+}
+
+{ #category : #converting }
+JsonArraySchema >> asJson [
+	| json |
+	json := super asJson.
+	items notNil ifTrue: [json items: items asJson].
+	minItems notNil ifTrue: [json at: 'minItems' put: minItems].
+	maxItems notNil ifTrue: [json at: 'maxItems' put: maxItems].
+	^json
+]
+
+{ #category : #initialization }
+JsonArraySchema >> initialize [
+	super initialize.
+	uniqueItems := false
+]
+
+{ #category : #testing }
+JsonArraySchema >> isArraySchema [
+	^true
+]
+
+{ #category : #accessing }
+JsonArraySchema >> items [
+	^items
+]
+
+{ #category : #accessing }
+JsonArraySchema >> items: aJsonSchema [
+	items := aJsonSchema.
+	aJsonSchema parent: self
+]
+
+{ #category : #accessing }
+JsonArraySchema >> maxItems [
+	^maxItems
+]
+
+{ #category : #accessing }
+JsonArraySchema >> maxItems: aNumber [
+	maxItems := aNumber
+]
+
+{ #category : #accessing }
+JsonArraySchema >> minItems [
+	^minItems
+]
+
+{ #category : #accessing }
+JsonArraySchema >> minItems: aNumber [
+	minItems := aNumber
+]
+
+{ #category : #accessing }
+JsonArraySchema >> uniqueItems [
+	^uniqueItems
+]
+
+{ #category : #accessing }
+JsonArraySchema >> uniqueItems: aBoolean [
+	uniqueItems := aBoolean
+]
+

modules/JSON/JsonBooleanSchema.st

@@ -0,0 +1,16 @@
+"
+	Copyright (c) 2020 Aucerna.
+	See (MIT) license in root directory.
+"
+
+Class {
+	#name : #JsonBooleanSchema,
+	#superclass : #JsonPrimitiveSchema,
+	#category : #JSON
+}
+
+{ #category : #testing }
+JsonBooleanSchema >> isBooleanSchema [
+	^true
+]
+