topnic-https 0.1.9 → 0.2.11

package/bin/cli.js

@@ -2,7 +2,7 @@
 
 const { program } = require('commander');
 const server = require('../src/main/index.js');
-const shareManager = require('../src/sharing/shareManager');
+const shareManager = require('../src/sharing/shareManager.js');
 
 program
 .command('help')
@@ -45,20 +45,20 @@ program
 
 program
   .command('share')
-  .description('Share your local server temporarily')
+  .description('Share local server temporarily')
   .option('-p, --port <number>', 'Port to share', 3000)
   .option('-d, --duration <minutes>', 'Share duration in minutes', 60)
   .action(async (options) => {
     try {
       const share = await shareManager.createShare(options.port, options.duration);
-      console.log('\n📢 Share Information:');
-      console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-      console.log(`🔗 Public URL: ${share.url}`);
-      console.log(`🆔 Share ID: ${share.id}`);
-      console.log(`⏱️ Duration: ${options.duration} minutes`);
-      console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n');
+      console.log('\nShare Information:');
+      console.log('--------------------------------');
+      console.log(`Public URL: ${share.url}`);
+      console.log(`Share ID: ${share.id}`);
+      console.log(`Duration: ${options.duration} minutes`);
+      console.log('--------------------------------\n');
     } catch (error) {
-      console.error('❌ Failed to create share:', error.message);
+      console.error('Failed to create share:', error.message);
     }
   });
 
@@ -68,30 +68,30 @@ program
   .action(() => {
     const shares = shareManager.getActiveShares();
     if (shares.length === 0) {
-      console.log('📭 No active shares');
+      console.log('No active shares');
       return;
     }
     
-    console.log('\n📋 Active Shares:');
-    console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+    console.log('\nActive Shares:');
+    console.log('--------------------------------');
     shares.forEach(share => {
-      console.log(`🔗 URL: ${share.url}`);
-      console.log(`🆔 ID: ${share.id}`);
-      console.log(`⏱️ Remaining: ${share.remainingMinutes} minutes`);
-      console.log('────────────────────────────────────────');
+      console.log(`URL: ${share.url}`);
+      console.log(`ID: ${share.id}`);
+      console.log(`Remaining: ${share.remainingMinutes} minutes`);
+      console.log('--------------------------------');
     });
     console.log('');
   });
 
 program
   .command('unshare <shareId>')
-  .description('Stop sharing a specific server')
+  .description('Stop a specific share')
   .action(async (shareId) => {
     try {
       await shareManager.closeShare(shareId);
-      console.log(`✅ Share ${shareId} has been stopped`);
+      console.log(`Share ${shareId} stopped successfully`);
     } catch (error) {
-      console.error('❌ Failed to stop share:', error.message);
+      console.error('Failed to stop share:', error.message);
     }
   });
 

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "topnic-https",
-  "version": "0.1.9",
+  "version": "0.2.11",
   "main": "./src/main/index.js",
+  "type": "commonjs",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -89,12 +90,15 @@
   "dependencies": {
     "chokidar": "^4.0.1",
     "commander": "^12.1.0",
+    "crypto": "^1.0.1",
     "electron": "^33.2.0",
     "fs": "^0.0.1-security",
     "https": "^1.0.0",
     "localtunnel": "^2.0.2",
     "nanoid": "^5.0.8",
+    "os": "^0.1.2",
     "path": "^0.12.7",
+    "uuid": "^11.0.3",
     "ws": "^8.18.0"
   }
 }

package/src/main/websocket.js

@@ -1,4 +1,4 @@
-const WebSocket = require('ws');
+import WebSocket from 'ws';
 
 function setupWebSocket(server) {
   const wss = new WebSocket.Server({ server });
@@ -22,4 +22,4 @@ function notifyClients(wss, message) {
   });
 }
 
-module.exports = { setupWebSocket, notifyClients }; 
+export { setupWebSocket, notifyClients }; 

package/src/sharing/shareManager.js

@@ -1,6 +1,5 @@
 const localtunnel = require('localtunnel');
-const { nanoid } = require('nanoid');
-const Logger = require('../utils/logger');
+const { v4: uuidv4 } = require('uuid');
 
 class ShareManager {
   constructor() {
@@ -9,54 +8,53 @@ class ShareManager {
 
   async createShare(port, duration) {
     try {
-      const shareId = nanoid(8);
-      
       const tunnel = await localtunnel({ port });
+      const shareId = uuidv4().slice(0, 8);
       
-      const shareInfo = {
+      const share = {
         id: shareId,
         url: tunnel.url,
+        tunnel,
         startTime: Date.now(),
-        duration: duration * 60 * 1000, 
-        tunnel
+        duration: duration * 60 * 1000 // تحويل الدقائق إلى ميلي ثانية
       };
-      
-      this.activeShares.set(shareId, shareInfo);
-      
+
+      this.activeShares.set(shareId, share);
+
+      // إغلاق المشاركة تلقائياً بعد انتهاء المدة
       setTimeout(() => {
         this.closeShare(shareId);
-      }, shareInfo.duration);
-      
-      Logger.success(`🌍 Share created: ${tunnel.url}`);
-      Logger.info(`⏱️ Share will expire in ${duration} minutes`);
-      
-      return shareInfo;
+      }, share.duration);
+
+      return {
+        id: shareId,
+        url: tunnel.url
+      };
     } catch (error) {
-      Logger.error(`Share creation failed: ${error.message}`);
-      throw error;
+      throw new Error(`فشل إنشاء المشاركة: ${error.message}`);
     }
   }
 
   async closeShare(shareId) {
     const share = this.activeShares.get(shareId);
-    if (share) {
-      await share.tunnel.close();
-      this.activeShares.delete(shareId);
-      Logger.info(`🔒 Share ${shareId} closed`);
+    if (!share) {
+      throw new Error('لم يتم العثور على المشاركة');
     }
+
+    await share.tunnel.close();
+    this.activeShares.delete(shareId);
   }
 
   getActiveShares() {
     const shares = [];
     for (const [id, share] of this.activeShares) {
-      const remainingTime = Math.max(0,
-        (share.startTime + share.duration - Date.now()) / 1000 / 60
-      );
+      const remainingTime = share.duration - (Date.now() - share.startTime);
+      const remainingMinutes = Math.max(0, Math.floor(remainingTime / (60 * 1000)));
       
       shares.push({
-        id: share.id,
+        id,
         url: share.url,
-        remainingMinutes: Math.round(remainingTime)
+        remainingMinutes
       });
     }
     return shares;

package/src/utils/monitor.js

@@ -1,4 +1,9 @@
-const os = require('os');
+import os from 'os';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 class ServerMonitor {
   constructor() {
@@ -35,4 +40,4 @@ class ServerMonitor {
   }
 }
 
-module.exports = new ServerMonitor(); 
+export default new ServerMonitor();