@urga-panel/ur-panels-core 1.0.5 → 1.0.6

package/dist/ServiceManager.js

@@ -123,6 +123,7 @@ export class _ServiceManager {
             // await _PageControllerService.start();
         }
         const createdServices = [];
+        const _this = this;
         for (const serviceInfo of services) {
             const { serviceName, service, tag, dynamicTag, isAbstract, requiredServices } = serviceInfo;
             // Fill usedService according to requiredServices
@@ -145,6 +146,7 @@ export class _ServiceManager {
                     usedService,
                     tag: tag,
                     type: type,
+                    ServiceManager: _this,
                     abilities: {
                         createChildService: (tag, PageCtor) => {
                             //console.log("createChildService called for ---", tag);
@@ -154,6 +156,8 @@ export class _ServiceManager {
                                     usedService: {},
                                     tag: tag,
                                     type: type,
+                                    //@ts-ignore
+                                    ServiceManager: _this
                                 }),
                                 status: "waitSetup",
                             });

package/dist/TestRun.d.ts

@@ -1 +1 @@
-export {};
+declare function main(): Promise<void>;

package/dist/TestRun.js

@@ -9,6 +9,6 @@ async function main() {
     //         LayoutService: _service
     //     }
     // );
+    console.log("Services initialized2222");
 }
 main().catch(console.error);
-export {};

package/dist/commands/createDB.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/commands/createDB.js

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+import fs from 'fs';
+import path from 'path';
+import { MongoClient } from 'mongodb';
+async function createMongoDB() {
+    const baseDir = process.cwd();
+    const databasePath = path.join(baseDir, 'src', 'project', 'database');
+    // MongoDB bağlantısı
+    const uri = 'mongodb://localhost:27017'; // kendi bağlantını yaz
+    const client = new MongoClient(uri);
+    await client.connect();
+    // Database klasörlerini al
+    const dbFolders = fs.readdirSync(databasePath, { withFileTypes: true })
+        .filter(f => f.isDirectory())
+        .map(f => f.name);
+    for (const dbName of dbFolders) {
+        //const db = client.db(dbName); // klasör adı database ismi
+        const entitiesPath = path.join(databasePath, dbName, 'Entities');
+        if (!fs.existsSync(entitiesPath))
+            continue;
+        // 1. Eğer varsa önceki veritabanını sil
+        const oldDb = client.db(dbName);
+        await oldDb.dropDatabase();
+        console.log(`🗑️ ${dbName} veritabanı silindi.`);
+        // 2. Aynı isimle yeni veritabanı oluştur
+        const newDb = client.db(dbName);
+        const files = fs.readdirSync(entitiesPath).filter(f => f.endsWith('.json'));
+        for (const file of files) {
+            const collectionName = file.replace('.json', '');
+            const collection = await newDb.createCollection(collectionName);
+            //JSON dosyasını oku
+            const data = JSON.parse(fs.readFileSync(path.join(entitiesPath, file), 'utf-8'));
+            // Tek obje veya array olabilir
+            /*
+            const docs = Array.isArray(data) ? data : [data];
+
+            // Collection’a ekle
+            if (docs.length > 0) {
+                await collection.insertMany(docs);
+                console.log(`Inserted ${docs.length} docs into ${dbName}.${collectionName}`);
+            }*/
+        }
+    }
+    await client.close();
+    console.log('All databases and collections created!');
+}
+createMongoDB().catch(console.error);

package/dist/commands/createTS.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/commands/createTS.js

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+import fs from 'fs';
+import path from 'path';
+import { execSync } from 'child_process';
+async function createInterfaces() {
+    const baseDir = process.cwd();
+    const databasePath = path.join(baseDir, 'src', 'project', 'database');
+    // Database içindeki tüm klasörleri al
+    const entityFolders = fs.readdirSync(databasePath, { withFileTypes: true })
+        .filter(f => f.isDirectory())
+        .map(f => f.name);
+    for (const folder of entityFolders) {
+        const entitiesPath = path.join(databasePath, folder, 'Entities');
+        const interfacePath = path.join(databasePath, folder, 'Interface');
+        if (!fs.existsSync(entitiesPath))
+            continue; // Entities klasörü yoksa atla
+        if (!fs.existsSync(interfacePath))
+            fs.mkdirSync(interfacePath, { recursive: true });
+        const files = fs.readdirSync(entitiesPath).filter(f => f.endsWith('.json'));
+        for (const file of files) {
+            const input = path.join(entitiesPath, file);
+            const output = path.join(interfacePath, file.replace('.json', '.d.ts'));
+            console.log(`Converting ${folder}/${file} -> ${folder}/Interface/${path.basename(output)}`);
+            execSync(`json2ts -i "${input}" -o "${output}"`, { stdio: 'inherit' });
+        }
+    }
+    console.log('All JSON files converted to TypeScript interfaces.');
+}
+createInterfaces().catch(console.error);

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

@@ -35,6 +35,7 @@ export declare abstract class AuthService extends Service {
             password: string;
             role?: string;
             databaseId?: string;
+            databases?: string[];
         };
     }>;
     logoutRequest({ username, password, params, request, url }: {

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

@@ -101,24 +101,27 @@ export class AuthService extends Service {
                     id: result.user.id,
                     username: result.user.username,
                     role: result.user.role,
-                    databaseId: result.user.databaseId // databaseId eklendi
+                    databaseId: result.user.databaseId,
+                    databases: result.user.databases // databaseId eklendi
                 }, JWT_SECRET, { expiresIn: '15m' });
                 // 5. Refresh Token üret
                 const refreshToken = jwt.sign({
                     id: result.user.id,
                     username: result.user.username,
                     role: result.user.role,
-                    databaseId: result.user.databaseId // databaseId eklendi
+                    databaseId: result.user.databaseId,
+                    databases: result.user.databases // databaseId eklendi
                 }, JWT_REFRESH_SECRET, { expiresIn: '7d' });
                 // return { status: "success", accessToken: accessToken, 
                 //     refreshToken: refreshToken };
                 //     // ...tokenları ürettikten sonra...
+                const headers = new Headers();
+                headers.append("Set-Cookie", `accessToken=${accessToken}; Path=/; Domain=.local.test; HttpOnly; SameSite=Lax; Max-Age=900`);
+                headers.append("Set-Cookie", `refreshToken=${refreshToken}; Path=/; Domain=.local.test; HttpOnly; SameSite=Lax; Max-Age=604800`);
+                headers.append("Content-Type", `application/json`);
                 return new Response(JSON.stringify({ status: "success", message: "valid credentials", data: { user: result.user } }), {
                     status: 200,
-                    headers: {
-                        "Set-Cookie": `accessToken=${accessToken}; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=900, refreshToken=${refreshToken}; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=604800`,
-                        'Content-Type': 'application/json'
-                    }
+                    headers: headers
                 });
             }
             return this.resposeHandler({ status: "fail", message: "Invalid credentials" });
@@ -190,13 +193,15 @@ export class AuthService extends Service {
                     id: decodedRefresh.id,
                     username: decodedRefresh.username,
                     role: decodedRefresh.role,
-                    databaseId: decodedRefresh.databaseId // databaseId eklendi
+                    databaseId: decodedRefresh.databaseId, // databaseId eklendi
+                    databases: decodedRefresh.databases // databases eklendi
                 }, JWT_SECRET, { expiresIn: '15m' });
                 const newRefreshToken = jwt.sign({
                     id: decodedRefresh.id,
                     username: decodedRefresh.username,
                     role: decodedRefresh.role,
-                    databaseId: decodedRefresh.databaseId // databaseId eklendi
+                    databaseId: decodedRefresh.databaseId, // databaseId eklendi
+                    databases: decodedRefresh.databases // databases eklendi
                 }, JWT_REFRESH_SECRET, { expiresIn: '7d' });
                 return { valid: true, newAccessToken, newRefreshToken, user: res.user };
             }
@@ -242,7 +247,8 @@ export class AuthService extends Service {
                     id: user?.id || null,
                     username: user?.username || null,
                     role: user?.role || null,
-                    databaseId: user?.databaseId || null // databaseId eklendi
+                    databaseId: user?.databaseId || null, // databaseId eklendi
+                    databases: user?.databases || null // databases eklendi
                 }
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urga-panel/ur-panels-core",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,7 +9,7 @@
     "test": "jest",
     "lint": "eslint src --ext .ts",
     "start": "npx cross-env MODE=DEBUG ts-node src/TestRun.ts",
-    "addServiceStatic": "npx ts-node src/addService/AddServiceStatic.ts"
+    "addServiceStatic": "npx ts-node src/TestRun.ts"
   },
   "devDependencies": {
     "@types/jest": "^29.0.0",
@@ -27,9 +27,12 @@
     "bcryptjs": "^3.0.2",
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "^9.0.2",
+    "mongodb": "^6.19.0",
     "yargs": "^18.0.0"
   },
   "bin": {
-    "urga-core-cli": "dist/addService/AddServiceStatic.js"
+    "urga-core-cli": "dist/TestRun.js",
+    "createTS": "dist/commands/createTS.js",
+    "createDB": "dist/commands/createDB.js"
   }
 }

package/src/ServiceManager.ts

@@ -142,6 +142,7 @@ export class _ServiceManager {
             // await _PageControllerService.start();
         }
         const createdServices: Service[] = [];
+        const _this = this;
         for (const serviceInfo of services) {
             const { serviceName, service, tag, dynamicTag, isAbstract, requiredServices } = serviceInfo;
             // Fill usedService according to requiredServices
@@ -164,6 +165,7 @@ export class _ServiceManager {
                     usedService,
                     tag: tag,
                     type: type,
+                    ServiceManager: _this,
                     abilities: {
                         createChildService: (tag: string, PageCtor?: ServiceConstructor<Service>) => {
                             //console.log("createChildService called for ---", tag);
@@ -173,6 +175,8 @@ export class _ServiceManager {
                                     usedService: {},
                                     tag: tag,
                                     type: type,
+                                    //@ts-ignore
+                                    ServiceManager: _this
                                 }),
                                 status: "waitSetup",
                             });

package/src/TestRun.ts

@@ -1,4 +1,3 @@
-import { ServiceManager } from './ServiceManager';
 
 async function main() {
     //const serviceManager = new ServiceManager();
@@ -12,6 +11,7 @@ async function main() {
     //         LayoutService: _service
     //     }
     // );
+    console.log("Services initialized2222");
 }
 
 main().catch(console.error);

package/src/commands/createDB.ts

@@ -0,0 +1,59 @@
+#!/usr/bin/env node
+import fs from 'fs';
+import path from 'path';
+import { MongoClient } from 'mongodb';
+
+async function createMongoDB() {
+    const baseDir = process.cwd();
+    const databasePath = path.join(baseDir, 'src', 'project', 'database');
+
+    // MongoDB bağlantısı
+    const uri = 'mongodb://localhost:27017'; // kendi bağlantını yaz
+    const client = new MongoClient(uri);
+    await client.connect();
+
+    // Database klasörlerini al
+    const dbFolders = fs.readdirSync(databasePath, { withFileTypes: true })
+        .filter(f => f.isDirectory())
+        .map(f => f.name);
+
+    for (const dbName of dbFolders) {
+        //const db = client.db(dbName); // klasör adı database ismi
+        const entitiesPath = path.join(databasePath, dbName, 'Entities');
+        if (!fs.existsSync(entitiesPath)) continue;
+
+
+        // 1. Eğer varsa önceki veritabanını sil
+        const oldDb = client.db(dbName);
+        await oldDb.dropDatabase();
+        console.log(`🗑️ ${dbName} veritabanı silindi.`);
+
+        // 2. Aynı isimle yeni veritabanı oluştur
+        const newDb = client.db(dbName);
+
+        const files = fs.readdirSync(entitiesPath).filter(f => f.endsWith('.json'));
+
+        for (const file of files) {
+            const collectionName = file.replace('.json', '');
+            const collection = await newDb.createCollection(collectionName);
+
+            //JSON dosyasını oku
+            const data = JSON.parse(fs.readFileSync(path.join(entitiesPath, file), 'utf-8'));
+
+            // Tek obje veya array olabilir
+            /*
+            const docs = Array.isArray(data) ? data : [data];
+
+            // Collection’a ekle
+            if (docs.length > 0) {
+                await collection.insertMany(docs);
+                console.log(`Inserted ${docs.length} docs into ${dbName}.${collectionName}`);
+            }*/
+        }
+    }
+
+    await client.close();
+    console.log('All databases and collections created!');
+}
+
+createMongoDB().catch(console.error);

package/src/commands/createTS.ts

@@ -0,0 +1,35 @@
+#!/usr/bin/env node
+import fs from 'fs';
+import path from 'path';
+import { execSync } from 'child_process';
+
+async function createInterfaces() {
+    const baseDir = process.cwd();
+    const databasePath = path.join(baseDir, 'src', 'project', 'database');
+
+    // Database içindeki tüm klasörleri al
+    const entityFolders = fs.readdirSync(databasePath, { withFileTypes: true })
+        .filter(f => f.isDirectory())
+        .map(f => f.name);
+
+    for (const folder of entityFolders) {
+        const entitiesPath = path.join(databasePath, folder, 'Entities');
+        const interfacePath = path.join(databasePath, folder, 'Interface');
+
+        if (!fs.existsSync(entitiesPath)) continue; // Entities klasörü yoksa atla
+        if (!fs.existsSync(interfacePath)) fs.mkdirSync(interfacePath, { recursive: true });
+
+        const files = fs.readdirSync(entitiesPath).filter(f => f.endsWith('.json'));
+
+        for (const file of files) {
+            const input = path.join(entitiesPath, file);
+            const output = path.join(interfacePath, file.replace('.json', '.d.ts'));
+            console.log(`Converting ${folder}/${file} -> ${folder}/Interface/${path.basename(output)}`);
+            execSync(`json2ts -i "${input}" -o "${output}"`, { stdio: 'inherit' });
+        }
+    }
+
+    console.log('All JSON files converted to TypeScript interfaces.');
+}
+
+createInterfaces().catch(console.error);

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

@@ -79,6 +79,7 @@ export abstract class AuthService extends Service {
             password: string; // Optional password field for internal use
             role?: string; // Optional role field
             databaseId?: string; // Optional database ID field
+            databases?: string[]; // Optional databases field
         };
     }>;
 
@@ -153,7 +154,8 @@ export abstract class AuthService extends Service {
                         id: result.user.id,
                         username: result.user.username,
                         role: result.user.role,
-                        databaseId: result.user.databaseId // databaseId eklendi
+                        databaseId: result.user.databaseId,
+                        databases: result.user.databases // databaseId eklendi
                     },
                     JWT_SECRET,
                     { expiresIn: '15m' }
@@ -165,7 +167,8 @@ export abstract class AuthService extends Service {
                         id: result.user.id,
                         username: result.user.username,
                         role: result.user.role,
-                        databaseId: result.user.databaseId // databaseId eklendi
+                        databaseId: result.user.databaseId,
+                        databases: result.user.databases // databaseId eklendi
                     },
                     JWT_REFRESH_SECRET,
                     { expiresIn: '7d' }
@@ -174,15 +177,26 @@ export abstract class AuthService extends Service {
                 // return { status: "success", accessToken: accessToken, 
                 //     refreshToken: refreshToken };
                 //     // ...tokenları ürettikten sonra...
+                const headers = new Headers();
+
+                headers.append(
+                    "Set-Cookie",
+                    `accessToken=${accessToken}; Path=/; Domain=.local.test; HttpOnly; SameSite=Lax; Max-Age=900`
+                );
+
+                headers.append(
+                    "Set-Cookie",
+                    `refreshToken=${refreshToken}; Path=/; Domain=.local.test; HttpOnly; SameSite=Lax; Max-Age=604800`
+                );
+                headers.append(
+                    "Content-Type",
+                    `application/json`
+                );
                 return new Response(
                     JSON.stringify({ status: "success", message: "valid credentials", data: { user: result.user } }),
                     {
                         status: 200,
-                        headers: {
-                            "Set-Cookie":
-                                `accessToken=${accessToken}; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=900, refreshToken=${refreshToken}; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=604800`,
-                            'Content-Type': 'application/json'
-                        }
+                        headers: headers
                     }
                 );
             }
@@ -241,6 +255,7 @@ export abstract class AuthService extends Service {
                     username: string;
                     role: string; // Refresh token'da rol bilgisi varsa
                     databaseId?: string;
+                    databases?: string[];
                 } = jwt.verify(refreshToken, JWT_REFRESH_SECRET) as unknown as any;
                 //debugger;
 
@@ -270,7 +285,8 @@ export abstract class AuthService extends Service {
                         id: decodedRefresh.id,
                         username: decodedRefresh.username,
                         role: decodedRefresh.role,
-                        databaseId: decodedRefresh.databaseId // databaseId eklendi
+                        databaseId: decodedRefresh.databaseId, // databaseId eklendi
+                        databases: decodedRefresh.databases // databases eklendi
                     },
                     JWT_SECRET,
                     { expiresIn: '15m' }
@@ -280,7 +296,8 @@ export abstract class AuthService extends Service {
                         id: decodedRefresh.id,
                         username: decodedRefresh.username,
                         role: decodedRefresh.role,
-                        databaseId: decodedRefresh.databaseId // databaseId eklendi
+                        databaseId: decodedRefresh.databaseId, // databaseId eklendi
+                        databases: decodedRefresh.databases // databases eklendi
                     },
                     JWT_REFRESH_SECRET,
                     { expiresIn: '7d' }
@@ -332,7 +349,8 @@ export abstract class AuthService extends Service {
                     id: user?.id || null,
                     username: user?.username || null,
                     role: user?.role || null,
-                    databaseId: user?.databaseId || null // databaseId eklendi
+                    databaseId: user?.databaseId || null, // databaseId eklendi
+                    databases: user?.databases || null // databases eklendi
                 }
             }
         });