topnic-https 1.2.5 → 1.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "topnic-https",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "main": "./src/main/index.js",
   "type": "commonjs",
   "scripts": {
@@ -91,10 +91,10 @@
     "chokidar": "^4.0.1",
     "commander": "^12.1.0",
     "crypto": "^1.0.1",
+    "dns": "^0.2.2",
     "electron": "^33.2.0",
     "fs": "^0.0.1-security",
     "https": "^1.0.0",
-    "localtunnel": "^2.0.2",
     "nanoid": "^5.0.8",
     "net": "^1.0.2",
     "ngrok": "^5.0.0-beta.2",

package/src/sharing/directServer.js

@@ -3,75 +3,60 @@ const WebSocket = require('ws');
 const { nanoid } = require('nanoid/non-secure');
 const os = require('os');
 const net = require('net');
+const dns = require('dns');
 
 class DirectServer {
   constructor() {
     this.connections = new Map();
     this.server = http.createServer(this.handleRequest.bind(this));
     this.wss = new WebSocket.Server({ server: this.server });
-    this.publicIp = this.getPublicIp();
+    this.publicIp = null;
   }
 
-  getPublicIp() {
-    const interfaces = os.networkInterfaces();
-    for (const iface of Object.values(interfaces)) {
-      const nonLocalIpv4 = iface.find(addr => addr.family === 'IPv4' && !addr.internal);
-      if (nonLocalIpv4) return nonLocalIpv4.address;
-    }
-    return 'localhost';
-  }
-
-  async isPortAvailable(port) {
+  async getPublicIp() {
     return new Promise((resolve) => {
-      const tester = net.createServer()
-        .once('error', () => resolve(false))
-        .once('listening', () => {
-          tester.once('close', () => resolve(true)).close();
-        })
-        .listen(port);
-    });
-  }
-
-  async start(port = 3500) {
-    if (!(await this.isPortAvailable(port))) {
-      console.log(`المنفذ ${port} مشغول، جاري المحاولة على منفذ آخر...`);
-      port = await this.findAvailablePort(3501);
-    }
+      // أولاً نحاول الحصول على IP المحلي
+      const interfaces = os.networkInterfaces();
+      let localIp = 'localhost';
+      
+      for (const iface of Object.values(interfaces)) {
+        const nonLocalIpv4 = iface.find(addr => 
+          addr.family === 'IPv4' && 
+          !addr.internal &&
+          addr.address !== '127.0.0.1'
+        );
+        if (nonLocalIpv4) {
+          localIp = nonLocalIpv4.address;
+          break;
+        }
+      }
 
-    return new Promise((resolve) => {
-      this.server.listen(port, '0.0.0.0', () => {
-        console.log(`🚀 خادم المشاركة يعمل على المنفذ ${port}`);
-        console.log(`📡 عنوان IP: ${this.publicIp}:${port}`);
-        resolve(port);
+      // نحاول الحصول على IP العام
+      dns.lookup(os.hostname(), (err, address, family) => {
+        if (!err && address && address !== '127.0.0.1') {
+          resolve(address);
+        } else {
+          resolve(localIp);
+        }
       });
     });
   }
 
-  async findAvailablePort(startPort) {
-    let port = startPort;
-    while (!(await this.isPortAvailable(port))) {
-      port++;
-    }
-    return port;
-  }
-
-  async verifyTargetPort(port) {
+  async start(port = 3500) {
     try {
-      const response = await new Promise((resolve, reject) => {
-        const req = http.request({
-          hostname: 'localhost',
-          port: port,
-          path: '/',
-          method: 'GET',
-          timeout: 2000
-        }, resolve);
-        
-        req.on('error', reject);
-        req.end();
+      this.publicIp = await this.getPublicIp();
+      
+      return new Promise((resolve) => {
+        this.server.listen(port, '0.0.0.0', () => {
+          console.log(`🚀 خادم المشاركة يعمل على المنفذ ${port}`);
+          console.log(`📡 عنوان IP: ${this.publicIp}:${port}`);
+          console.log(`🌐 يمكنك الوصول محلياً عبر: http://localhost:${port}`);
+          resolve(port);
+        });
       });
-      return true;
     } catch (error) {
-      return false;
+      console.error('خطأ في بدء الخادم:', error);
+      throw error;
     }
   }
 
@@ -91,12 +76,10 @@ class DirectServer {
       const connectionId = urlParts[1];
       const connection = this.connections.get(connectionId);
 
-      // إضافة CORS headers
       res.setHeader('Access-Control-Allow-Origin', '*');
       res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
       res.setHeader('Access-Control-Allow-Headers', '*');
 
-      // معالجة طلبات OPTIONS
       if (req.method === 'OPTIONS') {
         res.writeHead(200);
         res.end();
@@ -109,17 +92,8 @@ class DirectServer {
         return;
       }
 
-      // التحقق من أن الخدمة المحلية تعمل
-      if (!(await this.verifyTargetPort(connection.port))) {
-        res.writeHead(502);
-        res.end('الخدمة المحلية غير متاحة');
-        return;
-      }
-
-      // إعادة بناء المسار الأصلي
       const originalPath = urlParts.length > 2 ? '/' + urlParts.slice(2).join('/') : '/';
 
-      // إضافة معلومات التوجيه
       const options = {
         hostname: 'localhost',
         port: connection.port,
@@ -129,14 +103,12 @@ class DirectServer {
           ...req.headers,
           'X-Forwarded-Host': req.headers.host,
           'X-Forwarded-Proto': 'http',
-          'X-Forwarded-For': req.socket.remoteAddress,
+          'X-Real-IP': req.socket.remoteAddress,
           host: `localhost:${connection.port}`
         }
       };
 
-      // إنشاء طلب التوجيه
       const proxyReq = http.request(options, (proxyRes) => {
-        // نسخ headers الاستجابة
         Object.keys(proxyRes.headers).forEach(key => {
           res.setHeader(key, proxyRes.headers[key]);
         });
@@ -145,7 +117,6 @@ class DirectServer {
         proxyRes.pipe(res);
       });
 
-      // معالجة أخطاء التوجيه
       proxyReq.on('error', (error) => {
         console.error('خطأ في التوجيه:', error);
         if (!res.headersSent) {
@@ -154,7 +125,6 @@ class DirectServer {
         }
       });
 
-      // إرسال البيانات إلى التطبيق المحلي
       if (!req.readableEnded) {
         req.pipe(proxyReq);
       } else {

package/src/sharing/shareManager.js

@@ -12,25 +12,31 @@ class ShareManager {
 
   async createShare(port) {
     try {
-      const { id, accessCode } = this.server.createConnection(port);
-      const shareUrl = `http://${this.server.publicIp}:3500/${id}/login`;
+      const id = this.server.createConnection(port);
+      const serverPort = this.server.getPort();
+      const serverIp = await this.server.getPublicIp();
+      
+      const shareUrl = `http://${serverIp}:${serverPort}/${id}`;
+      const localUrl = `http://localhost:${serverPort}/${id}`;
       
       const share = {
         id,
         url: shareUrl,
-        accessCode,
+        localUrl,
         port: port,
         startTime: Date.now()
       };
 
       this.activeShares.set(id, share);
 
-      return {
-        id,
-        url: shareUrl,
-        accessCode,
-        localUrl: `http://localhost:${port}`
-      };
+      console.log('\n🌐 تم إنشاء المشاركة بنجاح!');
+      console.log('--------------------------------');
+      console.log('📡 الروابط المتاحة:');
+      console.log(`🏠 محلي: ${localUrl}`);
+      console.log(`🌍 خارجي: ${shareUrl}`);
+      console.log('--------------------------------\n');
+
+      return share;
     } catch (error) {
       throw new Error(`فشل إنشاء المشاركة: ${error.message}`);
     }
@@ -44,18 +50,7 @@ class ShareManager {
 
     this.server.removeConnection(shareId);
     this.activeShares.delete(shareId);
-  }
-
-  getShareStats(shareId) {
-    const share = this.activeShares.get(shareId);
-    if (!share) return null;
-
-    const stats = this.server.getConnectionStats(shareId);
-    return {
-      ...share,
-      ...stats,
-      uptime: Math.floor((Date.now() - share.startTime) / 1000 / 60) // بالدقائق
-    };
+    console.log(`\n✅ تم إغلاق المشاركة: ${shareId}`);
   }
 }