@urga-panel/ur-panels-core 1.0.1 → 1.0.3

package/dist/services/abstract/authServices/AuthService.d.ts

@@ -37,6 +37,13 @@ export declare abstract class AuthService extends Service {
             databaseId?: string;
         };
     }>;
+    logoutRequest({ username, password, params, request, url }: {
+        username: any;
+        password: any;
+        params: any;
+        request: any;
+        url: any;
+    }): Promise<any>;
     loginRequest({ username, password, params, request, url }: {
         username: any;
         password: any;

package/dist/services/abstract/authServices/AuthService.js

@@ -21,6 +21,7 @@ export class AuthService extends Service {
         const requestHandlerService = this.ots.usedService.RequestHandlerService();
         // requestHandlerService.addHandler("deneme",this.loginHandler.bind(this));
         requestHandlerService.addHandler("login", this.loginRequest.bind(this));
+        requestHandlerService.addHandler("logout", this.logoutRequest.bind(this));
         requestHandlerService.addHandler("deneme", this.deneme.bind(this), {
             auth: true,
             role: "guest" // Örnek olarak admin rolü
@@ -51,6 +52,23 @@ export class AuthService extends Service {
     //             role?: string; // Optional role field
     //         };
     //     }>;
+    async logoutRequest({ username, password, params, request, url }) {
+        try {
+            // Token cookie’lerini silmek için geçmiş tarih veriyoruz
+            return new Response(JSON.stringify({ status: "success", message: "Logged out successfully" }), {
+                status: 200,
+                headers: {
+                    "Set-Cookie": `accessToken=; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=0, ` +
+                        `refreshToken=; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=0`,
+                    "Content-Type": "application/json"
+                }
+            });
+        }
+        catch (error) {
+            console.error("Logout error:", error);
+            return new Response(JSON.stringify({ status: "error", message: "An error occurred during logout" }), { status: 500, headers: { "Content-Type": "application/json" } });
+        }
+    }
     // Define methods specific to AuthService here
     async loginRequest({ username, password, params, request, url }) {
         //const { username, password } = params;

package/dist/services/abstract/webviewServices/WVFrontService.d.ts

@@ -7,6 +7,7 @@ export type WVFrontServiceOts = ServiceOts & {
     usedService: {};
 };
 export declare class WVFrontService extends Service {
+    private static _requestIdCounter;
     static serviceInfo: {
         name: string;
         requiredServices: any[];

package/dist/services/abstract/webviewServices/WVFrontService.js

@@ -1,6 +1,7 @@
 import { Service } from "../../../types/Service.js";
 import { NSWebViewinterface } from "./nv.js";
 export class WVFrontService extends Service {
+    static _requestIdCounter = 0;
     static serviceInfo = {
         name: "WVFrontService",
         requiredServices: [],
@@ -27,28 +28,56 @@ export class WVFrontService extends Service {
     }
     async sendFetchRequest(url, options) {
         console.log("sendFetchRequest", url, options);
+        const id = `r_${Date.now()}_${++WVFrontService._requestIdCounter}`;
         return new Promise((resolve) => {
-            const callback = (args) => {
-                const param = args;
-                // Convert param to a Response object
-                //debugger;
-                //@ts-ignore
-                const byteArray = Object.values(param._bodyBlob._buffer);
-                //@ts-ignore
-                const uint8 = new Uint8Array(byteArray);
-                //@ts-ignore
-                const text = new TextDecoder().decode(uint8);
+            const handler = (args) => {
+                // support envelope { id, param } or legacy raw param
+                const envelope = args && typeof args === 'object' && 'id' in args ? args : { id: undefined, param: args };
+                if (envelope.id !== id)
+                    return; // ignore unrelated responses
+                const param = envelope.param;
+                // Try to extract text safely from different shapes we might receive
+                let text = null;
+                try {
+                    if (!param) {
+                        text = '';
+                    }
+                    else if (typeof param === 'string') {
+                        text = param;
+                    }
+                    else if (param._bodyBlob && param._bodyBlob._buffer) {
+                        // @ts-ignore
+                        const byteArray = Object.values(param._bodyBlob._buffer);
+                        // @ts-ignore
+                        const uint8 = new Uint8Array(byteArray);
+                        text = new TextDecoder().decode(uint8);
+                    }
+                    else if (param.body) {
+                        text = typeof param.body === 'string' ? param.body : JSON.stringify(param.body);
+                    }
+                    else {
+                        text = JSON.stringify(param);
+                    }
+                }
+                catch (e) {
+                    console.error('sendFetchRequest: failed to decode response body', e);
+                    text = '';
+                }
                 const response = new Response(text, {
                     status: 200,
                     headers: { "Content-Type": "application/json" }
                 });
-                //debugger;
-                console.log("sendFetchRequest received", param);
-                this.oWebViewInterface.removeListener('sendFetchRequest', callback);
+                console.log("sendFetchRequest received (id)", id, envelope.param);
+                // remove listeners
+                this.oWebViewInterface.removeListener('sendFetchRequest', handler);
+                this.oWebViewInterface.removeListener('sendFetchRequestResponse', handler);
                 resolve(response);
             };
-            this.oWebViewInterface.on('sendFetchRequest', callback);
-            this.oWebViewInterface.emit("sendFetchRequest", { url, options });
+            // listen for both legacy and explicit response events
+            this.oWebViewInterface.on('sendFetchRequest', handler);
+            this.oWebViewInterface.on('sendFetchRequestResponse', handler);
+            // emit request with id so receiver can correlate
+            this.oWebViewInterface.emit("sendFetchRequest", { id, url, options });
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urga-panel/ur-panels-core",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/services/abstract/authServices/AuthService.ts

@@ -37,6 +37,7 @@ export abstract class AuthService extends Service {
         const requestHandlerService = this.ots.usedService.RequestHandlerService() as RequestHandlerService;
         // requestHandlerService.addHandler("deneme",this.loginHandler.bind(this));
         requestHandlerService.addHandler("login", this.loginRequest.bind(this));
+        requestHandlerService.addHandler("logout", this.logoutRequest.bind(this));
         requestHandlerService.addHandler("deneme", this.deneme.bind(this), {
             auth: true,
             role: "guest" // Örnek olarak admin rolü
@@ -91,6 +92,30 @@ export abstract class AuthService extends Service {
     //         };
     //     }>;
 
+    async logoutRequest({ username, password, params, request, url }): Promise<any> {
+        try {
+            // Token cookie’lerini silmek için geçmiş tarih veriyoruz
+            return new Response(
+                JSON.stringify({ status: "success", message: "Logged out successfully" }),
+                {
+                    status: 200,
+                    headers: {
+                        "Set-Cookie":
+                            `accessToken=; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=0, ` +
+                            `refreshToken=; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=0`,
+                        "Content-Type": "application/json"
+                    }
+                }
+            );
+        } catch (error) {
+            console.error("Logout error:", error);
+            return new Response(
+                JSON.stringify({ status: "error", message: "An error occurred during logout" }),
+                { status: 500, headers: { "Content-Type": "application/json" } }
+            );
+        }
+    }
+
     // Define methods specific to AuthService here
     async loginRequest({ username, password, params, request, url }): Promise<any> {
         //const { username, password } = params;
@@ -124,9 +149,9 @@ export abstract class AuthService extends Service {
                 }
 
                 const accessToken = jwt.sign(
-                    { 
-                        id: result.user.id, 
-                        username: result.user.username, 
+                    {
+                        id: result.user.id,
+                        username: result.user.username,
                         role: result.user.role,
                         databaseId: result.user.databaseId // databaseId eklendi
                     },
@@ -136,9 +161,9 @@ export abstract class AuthService extends Service {
 
                 // 5. Refresh Token üret
                 const refreshToken = jwt.sign(
-                    { 
-                        id: result.user.id, 
-                        username: result.user.username, 
+                    {
+                        id: result.user.id,
+                        username: result.user.username,
                         role: result.user.role,
                         databaseId: result.user.databaseId // databaseId eklendi
                     },
@@ -231,7 +256,7 @@ export abstract class AuthService extends Service {
 
                 //Check role here
                 // Admin ise onay ver
-                
+
                 // Admin ise devam etsin
                 if (options?.role && res.user?.role === 'admin') {
                     // admin ise role kontrolü atlanır, devam edilir
@@ -251,9 +276,9 @@ export abstract class AuthService extends Service {
                     { expiresIn: '15m' }
                 );
                 const newRefreshToken = jwt.sign(
-                    { 
-                        id: decodedRefresh.id, 
-                        username: decodedRefresh.username, 
+                    {
+                        id: decodedRefresh.id,
+                        username: decodedRefresh.username,
                         role: decodedRefresh.role,
                         databaseId: decodedRefresh.databaseId // databaseId eklendi
                     },

package/src/services/abstract/webviewServices/WVFrontService.ts

@@ -9,6 +9,7 @@ export type WVFrontServiceOts = ServiceOts & {
 }
 
 export class WVFrontService extends Service {
+    private static _requestIdCounter = 0;
     static serviceInfo = {
         name: "WVFrontService",
         requiredServices: [],
@@ -40,31 +41,57 @@ export class WVFrontService extends Service {
 
     public async sendFetchRequest(url: string, options?: RequestInit): Promise<any> {
         console.log("sendFetchRequest", url, options);
+        const id = `r_${Date.now()}_${++WVFrontService._requestIdCounter}`;
 
         return new Promise((resolve) => {
-            const callback = (args: any) => {
-                const param = args as unknown;
-                // Convert param to a Response object
-                //debugger;
-                   //@ts-ignore
-                const byteArray = Object.values(param._bodyBlob._buffer);
-                //@ts-ignore
-                const uint8 = new Uint8Array(byteArray);
-                 //@ts-ignore
-                const text = new TextDecoder().decode(uint8);
-                const response = new Response(text,                    
-                    {
-                        status: 200,
-                        headers: { "Content-Type": "application/json" }
+            const handler = (args: any) => {
+                // support envelope { id, param } or legacy raw param
+                const envelope = args && typeof args === 'object' && 'id' in args ? args : { id: undefined, param: args };
+                if (envelope.id !== id) return; // ignore unrelated responses
+
+                const param = envelope.param as any;
+
+                // Try to extract text safely from different shapes we might receive
+                let text: string | null = null;
+                try {
+                    if (!param) {
+                        text = '';
+                    } else if (typeof param === 'string') {
+                        text = param;
+                    } else if (param._bodyBlob && param._bodyBlob._buffer) {
+                        // @ts-ignore
+                        const byteArray = Object.values(param._bodyBlob._buffer);
+                        // @ts-ignore
+                        const uint8 = new Uint8Array(byteArray);
+                        text = new TextDecoder().decode(uint8);
+                    } else if (param.body) {
+                        text = typeof param.body === 'string' ? param.body : JSON.stringify(param.body);
+                    } else {
+                        text = JSON.stringify(param);
                     }
-                );
-                //debugger;
-                console.log("sendFetchRequest received", param);
-                this.oWebViewInterface.removeListener('sendFetchRequest', callback);
+                } catch (e) {
+                    console.error('sendFetchRequest: failed to decode response body', e);
+                    text = '';
+                }
+
+                const response = new Response(text, {
+                    status: 200,
+                    headers: { "Content-Type": "application/json" }
+                });
+
+                console.log("sendFetchRequest received (id)", id, envelope.param);
+                // remove listeners
+                this.oWebViewInterface.removeListener('sendFetchRequest', handler);
+                this.oWebViewInterface.removeListener('sendFetchRequestResponse', handler);
                 resolve(response);
             };
-            this.oWebViewInterface.on('sendFetchRequest', callback);
-            this.oWebViewInterface.emit("sendFetchRequest", { url, options });
+
+            // listen for both legacy and explicit response events
+            this.oWebViewInterface.on('sendFetchRequest', handler);
+            this.oWebViewInterface.on('sendFetchRequestResponse', handler);
+
+            // emit request with id so receiver can correlate
+            this.oWebViewInterface.emit("sendFetchRequest", { id, url, options });
         });
     }