Switch to TypeScript

XArcade XInput/RestServer.cs

@@ -42,7 +42,8 @@ public void Stop () {
         }
 
         static public void SetCORSHeaders (IHttpContext ctx) {
-            ctx.Response.Headers["Access-Control-Allow-Origin"] = "*";
+            ctx.Response.AddHeader("Access-Control-Allow-Origin", "*");
+            ctx.Response.AddHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With");
         }
 
         static public void SendTextResponse (IHttpContext ctx, string response) {
@@ -67,6 +68,21 @@ static public Dictionary<string, object> ParseJson (string json) {
 
     [RestResource]
     class DefaultRestResource {
+        [RestRoute(HttpMethod = HttpMethod.OPTIONS, PathInfo = @"^.*?$")]
+        public IHttpContext CorsOptions(IHttpContext ctx) {
+            var validMethods = new HttpMethod[] {
+                HttpMethod.GET,
+                HttpMethod.POST,
+                HttpMethod.DELETE,
+                HttpMethod.OPTIONS,
+            };
+            ctx.Response.Headers["Access-Control-Allow-Methods"] = string.Join(", ", validMethods.Select(x => x.ToString()));
+
+            RestServer.SetCORSHeaders(ctx);
+            RestServer.CloseResponse(ctx);
+            return ctx;
+        }
+
         [RestRoute(HttpMethod = HttpMethod.GET, PathInfo = "/")]
         public IHttpContext Index (IHttpContext ctx) {
             string prefix = ctx.Server.PublicFolder.Prefix;
@@ -159,19 +175,6 @@ public IHttpContext KeyboardSetMapping (IHttpContext ctx) {
             return ctx;
         }
 
-        [RestRoute(HttpMethod = HttpMethod.OPTIONS, PathInfo = "/api/keyboard/mapping")]
-        public IHttpContext KeyboardMappingOptions (IHttpContext ctx) {
-            var validMethods = new HttpMethod[] {
-                HttpMethod.GET,
-                HttpMethod.POST,
-                HttpMethod.DELETE,
-                HttpMethod.OPTIONS,
-            };
-            ctx.Response.Headers["Access-Control-Allow-Methods"] = string.Join(", ", validMethods.Select(x => x.ToString()));
-            RestServer.SetCORSHeaders(ctx);
-            RestServer.CloseResponse(ctx);
-            return ctx;
-        }
 
         [RestRoute(HttpMethod = HttpMethod.DELETE, PathInfo = "/api/keyboard/mapping")]
         public IHttpContext KeyboardDeleteMapping (IHttpContext ctx) {

script/build.bat

@@ -3,8 +3,8 @@
 REM Build webapp
 rd /S /Q webapp\build\
 pushd webapp\
-call yarn install
-call yarn run build
+call npm install
+call node_modules\.bin\react-scripts-ts build
 popd
 
 REM Grab Scp Driver Installer

swagger.yml

@@ -0,0 +1,186 @@
+swagger: '2.0'
+
+info:
+  version: '1.0.0'
+  title: XArcade XInput Rest API
+
+host: 10.0.1.2:32123
+schemes:
+- http
+basePath: /api
+consumes:
+  - application/json
+
+tags:
+- name: keyboard
+  description: Keyboard mapping and service
+- name: controller
+  description: Add / remove fake controllers
+
+paths:
+  /keyboard/start:
+    post:
+      summary: Start watching keyboard for input
+      tags:
+      - keyboard
+      consumes:
+      - application/json
+      responses:
+        200:
+          description: Ok
+
+  /keyboard/stop:
+    post:
+      summary: Stop watching keyboard for input
+      tags:
+      - keyboard
+      responses:
+        200:
+          description: Ok
+
+  /keyboard/mapping:
+    get:
+      tags:
+      - keyboard
+      summary: Get keyboard mapping list and status
+      responses:
+        200:
+          description: Ok
+          schema:
+            type: object
+            properties:
+              currentMapping:
+                type: string
+              mappings:
+                type: object
+                additionalProperties:
+                  type: string
+                example:
+                  Mapping 1: '{ "Space": [0, "A"] }'
+                  Mapping 2: '{ "Space": [0, "X"] }'
+
+    post:
+      summary: Update a mapping
+      tags:
+      - keyboard
+      parameters:
+      - name: body
+        in: body
+        schema:
+          type: object
+          properties:
+            name:
+              type: string
+              description: Mapping name
+            mapping:
+              type: string
+              description: JSON contents of mapping
+      responses:
+        200:
+          description: Ok
+        500:
+          description: Error
+          schema:
+            $ref: '#/definitions/BasicError'
+
+    delete:
+      summary: Delete a mapping
+      tags:
+      - keyboard
+      parameters:
+      - name: body
+        in: body
+        schema:
+          type: string
+          description: Name of mapping to delete
+      responses:
+        200:
+          description: Ok
+        500:
+          description: Error
+          schema:
+            $ref: '#/definitions/BasicError'
+
+  /keyboard/mapping/current:
+    post:
+      summary: Change mapping
+      tags:
+      - keyboard
+      parameters:
+      - name: body
+        in: body
+        schema:
+          type: string
+          description: Name of mapping to switch to
+      responses:
+        200:
+          description: Ok
+        500:
+          description: Error
+          schema:
+            $ref: '#/definitions/BasicError'
+
+  /keyboard/mapping/rename:
+    post:
+      summary: Rename a mapping
+      tags:
+      - keyboard
+      parameters:
+      - name: body
+        in: body
+        schema:
+          type: object
+          properties:
+            name:
+              type: string
+            newName:
+              type: string
+      responses:
+        200:
+          description: Ok
+        500:
+          description: Error
+          schema:
+            $ref: '#/definitions/BasicError'
+
+  /controller/start:
+    post:
+      summary: Add fake controllers
+      tags:
+      - controller
+      responses:
+        200:
+          description: Ok
+
+  /controller/stop:
+    post:
+      summary: Remove fake controllers
+      tags:
+      - controller
+      responses:
+        200:
+          description: Ok
+
+  /status:
+    get:
+      summary: Get running status
+      responses:
+        200:
+          description: Ok
+          schema:
+            type: object
+            properties:
+              isControllerRunning:
+                type: boolean
+              isKeyboardRunning:
+                type: boolean
+              hostname:
+                type: string
+
+definitions:
+  BasicError:
+    type: object
+    properties:
+      error:
+        type: string
+        description: Error message

webapp/.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false

webapp/.gitignore

@@ -11,8 +11,11 @@
 
 # misc
 .DS_Store
-.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-

webapp/.vscode/launch.json

@@ -0,0 +1,34 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "chrome",
+      "request": "launch",
+      "name": "Launch Chrome",
+      "sourceMaps": true,
+      "port": 9241,
+      "showAsyncStacks": true,
+      "url": "http://localhost:3000"
+    },
+    {
+      "type": "chrome",
+      "request": "attach",
+      "name": "Attach to Chrome",
+      "sourceMaps": true,
+      "port": 9241,
+      "showAsyncStacks": true
+    },
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attch to Tests (:9243)",
+      "restart": true,
+      "sourceMaps": true,
+      "showAsyncStacks": true,
+      "port": 9243
+    }
+  ]
+}