Merge pull request #27 from AmRo045/dev

Improve the dak endpoint & update instructions

Author: AmRo045

README.md

@@ -16,10 +16,11 @@ Outline Admin is a web interface for the Outline Manager API, providing a simple
    - [Docker](#docker)
    - [Docker Compose](#docker-compose)
    - [NodeJS](#nodejs)
-3. [Development](#development)
-4. [Admin Password](#admin-password)
-5. [Donation](#donation)
-6. [Screenshots](#screenshots)
+3. [Updating to Latest Version](#updating-to-latest-version)
+4. [Development](#development)
+5. [Admin Password](#admin-password)
+6. [Donation](#donation)
+7. [Screenshots](#screenshots)
 
 ## Added Features
 
@@ -28,7 +29,6 @@ Outline Admin is a web interface for the Outline Manager API, providing a simple
 - Dynamic Access Keys.
 - Access Key prefix.
 
-
 ## Installation
 
 ### Docker
@@ -93,6 +93,33 @@ cd .next/standalone
 node server.js
 ```
 
+## Updating to Latest Version
+
+Pull the latest version of the outline-admin image
+```bash
+docker pull amro045/outline-admin:latest
+```
+
+Stop running container
+
+```bash
+docker compose down
+```
+
+Restart the container
+
+```bash
+docker compose up -d
+```
+
+Clean up the old image to free up disk space
+
+```bash
+docker rmi {old-image-id}
+```
+
+Replace {old-image-id} with the ID of the old image you want to remove.
+
 ## Development
 
 Follow the steps below:

package.json

@@ -1,6 +1,6 @@
 {
     "name": "outline-admin",
-    "version": "0.1.15",
+    "version": "0.1.17",
     "private": true,
     "scripts": {
         "compile": "tsc -p tsconfig.scripts.json && tscpaths -p tsconfig.scripts.tscpaths.json -s ./dist -o ./dist",

src/app/api/dak/[...path]/route.ts

@@ -20,7 +20,7 @@ interface ContextProps {
 export async function GET(req: Request, context: ContextProps) {
     const path = context.params.path.join("/");
 
-    const dynamicAccessKey = await getDynamicAccessKeyByPath(path, true);
+    const dynamicAccessKey = await getDynamicAccessKeyByPath(path);
 
     if (!dynamicAccessKey) {
         return NextResponse.json({
@@ -84,7 +84,7 @@ const selectAccessKey = async (
 
     switch (dynamicAccessKey.loadBalancerAlgorithm) {
         case LoadBalancerAlgorithm.UserIpAddress:
-            return selectedAccessKeyByClientIp(accessKeys, clientIp);
+            return selectAccessKeyByClientIp(accessKeys, clientIp);
 
         case LoadBalancerAlgorithm.RandomServerKeyOnEachConnection:
             return selectRandomServerKey(accessKeys);
@@ -95,7 +95,7 @@ const selectAccessKey = async (
     }
 };
 
-const selectedAccessKeyByClientIp = (accessKeys: AccessKey[], clientIp: string) => {
+const selectAccessKeyByClientIp = (accessKeys: AccessKey[], clientIp: string) => {
     const hash = crc32(clientIp);
     const index = hash % accessKeys.length;
 

src/core/actions/dynamic-access-key.ts

@@ -55,16 +55,19 @@ export async function getDynamicAccessKeyById(
     });
 }
 
-export async function getDynamicAccessKeyByPath(
-    path: string,
-    withKeys: boolean = false
-): Promise<DynamicAccessKeyWithAccessKeys | null> {
+export async function getDynamicAccessKeyByPath(path: string): Promise<DynamicAccessKeyWithAccessKeys | null> {
     return prisma.dynamicAccessKey.findFirst({
         where: {
             path
         },
         include: {
-            accessKeys: withKeys
+            accessKeys: {
+                where: {
+                    server: {
+                        isAvailable: true
+                    }
+                }
+            }
         }
     });
 }