ハードウェアのコネクタを変更しました。

.devcontainer/devcontainer.json

@@ -1,30 +1,54 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/docker-existing-dockerfile
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose
 {
-	"name": "Existing Dockerfile",
-
-	// Sets the run context to one level up instead of the .devcontainer folder.
-	"context": "..",
-
-	// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
-	"dockerFile": "../Dockerfile.dev",
-
-	"workspaceFolder": "/app", 
-	"workspaceMount": "source=${localWorkspaceFolder},target=/app,type=bind,consistency=cached"
-
+	"name": "Existing Docker Compose (Extend)",
+
+	// Update the 'dockerComposeFile' list if you have more compose files or use different names.
+	// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
+	"dockerComposeFile": [
+		"../docker-compose.dev.yaml",
+		"docker-compose.yml"
+	],
+
+	// The 'service' property is the name of the service for the container that VS Code should
+	// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
+	"service": "km4k",
+
+	// The optional 'workspaceFolder' property is the path VS Code should open by default when
+	// connected. This is typically a file mount in .devcontainer/docker-compose.yml
+	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-python.python"
+			]
+		}
+	},
+	"features": {
+		"ghcr.io/devcontainers/features/git:1": {
+			"ppa": true,
+			"version": "os-provided"
+		}
+	}
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 
-	// Uncomment the next line to run commands after the container is created - for example installing curl.
-	// "postCreateCommand": "apt-get update && apt-get install -y curl",
+	// Uncomment the next line if you want start specific services in your Docker Compose config.
+	// "runServices": [],
+
+	// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
+	// "shutdownAction": "none",
 
-	// Uncomment when using a ptrace-based debugger like C++, Go, and Rust
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+	// Uncomment the next line to run commands after the container is created.
+	// "postCreateCommand": "cat /etc/os-release",
 
-	// Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
-	// "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
+	// Configure tool-specific properties.
+	// "customizations": {},
 
-	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
-	// "remoteUser": "vscode"
+	// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "devcontainer"
 }

.devcontainer/docker-compose.yml

@@ -0,0 +1,26 @@
+version: '3.1'
+services:
+  # Update this to the name of the service you want to work with in your docker-compose.yml file
+  km4k:
+    # Uncomment if you want to override the service's Dockerfile to one in the .devcontainer 
+    # folder. Note that the path of the Dockerfile and context is relative to the *primary* 
+    # docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile"
+    # array). The sample below assumes your primary file is in the root of your project.
+    #
+    # build:
+    #   context: .
+    #   dockerfile: .devcontainer/Dockerfile
+
+    volumes:
+      # Update this to wherever you want VS Code to mount the folder of your project
+      - ..:/workspaces:cached
+
+    # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
+    # cap_add:
+    #   - SYS_PTRACE
+    # security_opt:
+    #   - seccomp:unconfined
+
+    # Overrides default command so things don't shut down after the process ends.
+    command: /bin/sh -c "while sleep 1000; do :; done"
+

.github/workflows/python-app.yml

@@ -16,6 +16,18 @@ jobs:
 
     runs-on: ubuntu-20.04
 
+    services:
+      # ref: https://docs.github.com/ja/actions/using-containerized-services/creating-redis-service-containers
+      redis:
+        image: redis:alpine
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python
@@ -26,8 +38,16 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements-dev.txt
+    - name: Check format
+      run: black --check --verbose --diff .
+    - name: Lint
+      run: ruff check --format github .
     - name: Test with unittest and gather code coverage
       run: coverage run --branch -m unittest
+      env:
+        REDIS_HOST: localhost
+        REDIS_PORT: 6379
+        REDIS_DB: 0
     - name: Show coverage
       run: |
         coverage report -m

Dockerfile.dev

@@ -1,11 +1,12 @@
-FROM python:3.7.3
+FROM debian:buster-slim
 
-RUN apt update \
-  && apt install -y libusb-1.0-0 \
-  && rm -rf /var/lib/apt/lists/*
+RUN apt-get update \
+  && apt-get install -y libusb-1.0-0 python3 python3-pip \
+  && rm -rf /var/lib/apt/lists/* \
+  && python3 -m pip install pip==23.2.1
 
 WORKDIR /app
 COPY requirements*.txt /app/
-RUN pip install -r requirements-dev.txt
+RUN pip3 install -r requirements-dev.txt
 
 COPY *.py /app/

README.md

@@ -1,39 +1,23 @@
-# KagiMod for Koken (KM4K)
+# KagiMod for Koken ver.2 (KM4K2)
 
-## How to Use
+KagiMod for Kokenを元にして認証機能を切り離したものです。
 
-### Register
-
-```
-$ ./Register.sh 
-Add User
-name> kokenuser
-Touch your Suica
-Registered (idm:****)
-$
-```
-
-### Unregister
-
-```
-$ ./Unregister.sh 
-Delete User
-name> kokenuser
-Deleted (name:kokenuser)
-$
-```
+RedisにIdmをキャッシュすることによって高速な認証を実現しています。
 
 ### Launch
 
 KM4K.serviceはsystemdに登録されています。
 
 ```
-systemctl status KM4K
+systemctl status KM4K2
 ```
 
 で確認
 
 ### 環境変数
 
-- `VERIFY_API_URL` : CardManagerのカード認証用エンドポイント
+- `CARD_MANAGER_BASE_URL` : CardManagerのAPIベースURL
 - `API_KEY` : CardManagerのAPI-Key
+- `REDIS_HOST` : Redisサーバーのホスト名
+- `REDIS_PORT` : Redisサーバーのポート番号
+- `REDIS_DB` : RedisサーバーのDB番号