@arcote.tech/arc-host 0.1.4 → 0.1.5

package/dist/host.d.ts

@@ -15,6 +15,10 @@ declare class RTCHost implements RealTimeCommunicationAdapter {
      * Convert JWT payload to AuthContext
      */
     private tokenToAuthContext;
+    /**
+     * Extract client IP address from request headers
+     */
+    private getClientIpAddress;
     /**
      * Get default auth context for anonymous users
      */

package/dist/host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../host.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,aAAa,EAElB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EAGvB,KAAK,4BAA4B,EAClC,MAAM,kBAAkB,CAAC;AAI1B,cAAM,OAAQ,YAAW,4BAA4B;IAMjD,OAAO,CAAC,OAAO;IALjB,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,KAAK,CAAuB;gBAG1B,OAAO,EAAE,aAAa,EAC9B,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC;IASrC,aAAa,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,IAAI;IAI5C,IAAI,CACR,gBAAgB,EAAE,CAAC,EACjB,KAAK,EACL,IAAI,GACL,EAAE;QACD,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KACd,KAAK,IAAI,GACT,OAAO,CAAC,IAAI,CAAC;YAIF,eAAe;IAU7B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAO7B;;OAEG;YACW,qBAAqB;IAWnC;;OAEG;IACH,OAAO,CAAC,iBAAiB;YAwCX,aAAa;YAmDb,WAAW;IAgEzB,OAAO,CAAC,WAAW;IA6DnB,OAAO,CAAC,gBAAgB;YAOV,UAAU;YA+CV,SAAS;IAevB,OAAO,CAAC,cAAc;CAGvB;AAED,eAAO,MAAM,cAAc,YACf,aAAa,aAAa,OAAO,CAAC,eAAe,CAAC,kBAE3D,CAAC"}
+{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../host.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,aAAa,EAElB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EAGvB,KAAK,4BAA4B,EAClC,MAAM,kBAAkB,CAAC;AAI1B,cAAM,OAAQ,YAAW,4BAA4B;IAMjD,OAAO,CAAC,OAAO;IALjB,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,KAAK,CAAuB;gBAG1B,OAAO,EAAE,aAAa,EAC9B,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC;IASrC,aAAa,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,IAAI;IAI5C,IAAI,CACR,gBAAgB,EAAE,CAAC,EACjB,KAAK,EACL,IAAI,GACL,EAAE;QACD,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KACd,KAAK,IAAI,GACT,OAAO,CAAC,IAAI,CAAC;YAIF,eAAe;IAS7B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAW1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAuB1B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;OAEG;YACW,qBAAqB;IAWnC;;OAEG;IACH,OAAO,CAAC,iBAAiB;YAwCX,aAAa;YAoDb,WAAW;IAiEzB,OAAO,CAAC,WAAW;IA6DnB,OAAO,CAAC,gBAAgB;YAsBV,UAAU;YA+CV,SAAS;IAevB,OAAO,CAAC,cAAc;CAGvB;AAED,eAAO,MAAM,cAAc,YACf,aAAa,aAAa,OAAO,CAAC,eAAe,CAAC,kBAE3D,CAAC"}

package/dist/index.js

@@ -6719,20 +6719,36 @@ class RTCHost {
       const payload = verifyToken(token);
       return payload;
     } catch (error) {
-      console.error("Token verification failed:", error);
       return null;
     }
   }
-  tokenToAuthContext(payload) {
+  tokenToAuthContext(payload, ipAddress) {
     return {
       userId: payload.userId,
-      roles: []
+      roles: [],
+      ipAddress
     };
   }
-  getDefaultAuthContext() {
+  getClientIpAddress(req) {
+    const xForwardedFor = req.headers.get("x-forwarded-for");
+    const xRealIp = req.headers.get("x-real-ip");
+    const cfConnectingIp = req.headers.get("cf-connecting-ip");
+    if (xForwardedFor) {
+      return xForwardedFor.split(",")[0].trim();
+    }
+    if (xRealIp) {
+      return xRealIp;
+    }
+    if (cfConnectingIp) {
+      return cfConnectingIp;
+    }
+    return;
+  }
+  getDefaultAuthContext(ipAddress) {
     return {
       userId: "anonymous",
-      roles: []
+      roles: [],
+      ipAddress
     };
   }
   async parseFormDataToObject(formData) {
@@ -6784,15 +6800,16 @@ class RTCHost {
     try {
       const authHeader = req.headers.get("Authorization");
       const token = authHeader?.replace("Bearer ", "");
+      const clientIp = this.getClientIpAddress(req);
       let authContext;
       if (token && !this.isPublicEndpoint(url.pathname)) {
         const payload = await this.verifyAuthToken(token);
         if (!payload) {
           return new Response("Invalid or expired token", { status: 401 });
         }
-        authContext = this.tokenToAuthContext(payload);
+        authContext = this.tokenToAuthContext(payload, clientIp);
       } else {
-        authContext = this.getDefaultAuthContext();
+        authContext = this.getDefaultAuthContext(clientIp);
       }
       let argument;
       const contentType = req.headers.get("Content-Type");
@@ -6817,13 +6834,14 @@ class RTCHost {
     try {
       const authHeader = req.headers.get("Authorization");
       const token = authHeader?.replace("Bearer ", "");
+      const clientIp = this.getClientIpAddress(req);
       let authContext;
       if (token) {
         const payload = await this.verifyAuthToken(token);
         if (!payload) {
           return new Response("Invalid or expired token", { status: 401 });
         }
-        authContext = this.tokenToAuthContext(payload);
+        authContext = this.tokenToAuthContext(payload, clientIp);
       } else {
         return new Response("Authorization token required", { status: 401 });
       }
@@ -6901,8 +6919,15 @@ class RTCHost {
     });
   }
   isPublicEndpoint(pathname) {
-    const publicEndpoints = ["/command/signin", "/command/register"];
-    return publicEndpoints.some((endpoint) => pathname === endpoint);
+    if (!pathname.startsWith("/command/")) {
+      return false;
+    }
+    const commandName = pathname.split("/command/")[1];
+    if (!commandName) {
+      return false;
+    }
+    const contextElement = this.context.elements.find((element) => element.name === commandName);
+    return contextElement && "isPublic" in contextElement ? contextElement.isPublic === true : false;
   }
   async handleSync(lastDate) {
     const syncDate = new Date;

package/host.ts

@@ -53,7 +53,6 @@ class RTCHost implements RealTimeCommunicationAdapter {
       const payload = verifyToken(token);
       return payload;
     } catch (error) {
-      console.error("Token verification failed:", error);
       return null;
     }
   }
@@ -61,20 +60,51 @@ class RTCHost implements RealTimeCommunicationAdapter {
   /**
    * Convert JWT payload to AuthContext
    */
-  private tokenToAuthContext(payload: TokenPayload): AuthContext {
+  private tokenToAuthContext(
+    payload: TokenPayload,
+    ipAddress?: string,
+  ): AuthContext {
     return {
       userId: payload.userId,
       roles: [], // Default to no roles, you may want to extend TokenPayload to include roles
+      ipAddress,
     };
   }
 
+  /**
+   * Extract client IP address from request headers
+   */
+  private getClientIpAddress(req: Request): string | undefined {
+    // Check common headers for client IP
+    const xForwardedFor = req.headers.get("x-forwarded-for");
+    const xRealIp = req.headers.get("x-real-ip");
+    const cfConnectingIp = req.headers.get("cf-connecting-ip");
+
+    if (xForwardedFor) {
+      // x-forwarded-for can contain multiple IPs, take the first one
+      return xForwardedFor.split(",")[0].trim();
+    }
+
+    if (xRealIp) {
+      return xRealIp;
+    }
+
+    if (cfConnectingIp) {
+      return cfConnectingIp;
+    }
+
+    // Fallback - this might not work in all environments
+    return undefined;
+  }
+
   /**
    * Get default auth context for anonymous users
    */
-  private getDefaultAuthContext(): AuthContext {
+  private getDefaultAuthContext(ipAddress?: string): AuthContext {
     return {
       userId: "anonymous",
       roles: [],
+      ipAddress,
     };
   }
 
@@ -148,15 +178,16 @@ class RTCHost implements RealTimeCommunicationAdapter {
       const authHeader = req.headers.get("Authorization");
       const token = authHeader?.replace("Bearer ", "");
 
+      const clientIp = this.getClientIpAddress(req);
       let authContext: AuthContext;
       if (token && !this.isPublicEndpoint(url.pathname)) {
         const payload = await this.verifyAuthToken(token);
         if (!payload) {
           return new Response("Invalid or expired token", { status: 401 });
         }
-        authContext = this.tokenToAuthContext(payload);
+        authContext = this.tokenToAuthContext(payload, clientIp);
       } else {
-        authContext = this.getDefaultAuthContext();
+        authContext = this.getDefaultAuthContext(clientIp);
       }
 
       let argument: any;
@@ -192,13 +223,14 @@ class RTCHost implements RealTimeCommunicationAdapter {
       const authHeader = req.headers.get("Authorization");
       const token = authHeader?.replace("Bearer ", "");
 
+      const clientIp = this.getClientIpAddress(req);
       let authContext: AuthContext;
       if (token) {
         const payload = await this.verifyAuthToken(token);
         if (!payload) {
           return new Response("Invalid or expired token", { status: 401 });
         }
-        authContext = this.tokenToAuthContext(payload);
+        authContext = this.tokenToAuthContext(payload, clientIp);
       } else {
         return new Response("Authorization token required", { status: 401 });
       }
@@ -312,10 +344,25 @@ class RTCHost implements RealTimeCommunicationAdapter {
   }
 
   private isPublicEndpoint(pathname: string): boolean {
-    // Define which endpoints don't require authentication
-    const publicEndpoints = ["/command/signin", "/command/register"];
+    // Extract command name from pathname
+    if (!pathname.startsWith("/command/")) {
+      return false;
+    }
+
+    const commandName = pathname.split("/command/")[1];
+    if (!commandName) {
+      return false;
+    }
+
+    // Get the command from the context and check if it's marked as public
+    const contextElement = this.context.elements.find(
+      (element: any) => element.name === commandName,
+    );
 
-    return publicEndpoints.some((endpoint) => pathname === endpoint);
+    // Check if it's an ArcCommand instance and if it's marked as public
+    return contextElement && "isPublic" in contextElement
+      ? contextElement.isPublic === true
+      : false;
   }
 
   private async handleSync(lastDate: string | null) {

package/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "private": false,
   "author": "Przemysław Krasiński [arcote.tech]",
   "dependencies": {