rc

Author: peter xie

app/server.js

@@ -30,7 +30,6 @@ const Imap = require("./imap");
 const freePort = require("portastic");
 const Stream = require("stream");
 //import * as Ping from 'net-ping'
-const netPing = require("net-ping");
 const buffer_1 = require("buffer");
 const openpgp = require('openpgp');
 const Express = require('express');
@@ -675,13 +674,16 @@ class localServer {
             remote.app.exit();
         });
         socket.on('pingCheck', CallBack => {
+            if (process.platform === 'linux')
+                return CallBack(new Error('not support'));
             saveLog(`socket.on ( 'pingCheck' )`);
             if (!this.regionV1 || this.pingChecking) {
                 saveLog(`!this.regionV1 [${!this.regionV1}] || this.pingChecking [${this.pingChecking}]`);
                 return CallBack();
             }
             this.pingChecking = true;
             try {
+                const netPing = require('net-ping');
                 const session = netPing.createSession();
             }
             catch (ex) {
@@ -1727,6 +1729,7 @@ const testPing = (hostIp, CallBack) => {
     test.fill(hostIp);
     saveLog(`start testPing [${hostIp}]`);
     return Async.eachSeries(test, (n, next) => {
+        const netPing = require('net-ping');
         const session = netPing.createSession();
         session.pingHost(hostIp, (err, target, sent, rcvd) => {
             session.close();

app/server.ts

@@ -34,7 +34,7 @@ import * as Stream from 'stream'
 import { start } from 'repl'
 import { imapAccountTest } from './imap'
 //import * as Ping from 'net-ping'
-import * as netPing from 'net-ping'
+
 import { Buffer } from 'buffer'
 
 const openpgp = require ( 'openpgp' )
@@ -716,6 +716,8 @@ export class localServer {
 		})
 
 		socket.on ( 'pingCheck', CallBack => {
+			if ( process.platform === 'linux')
+				return CallBack ( -1 )
 			saveLog (`socket.on ( 'pingCheck' )`)
 			if ( !this.regionV1 || this.pingChecking ) {
 				saveLog (`!this.regionV1 [${ !this.regionV1 }] || this.pingChecking [${ this.pingChecking }]`)
@@ -724,6 +726,7 @@ export class localServer {
 
 			this.pingChecking = true
 			try {
+				const netPing = require ('net-ping')
 				const session = netPing.createSession ()
 			} catch (ex) {
 				console.log (`netPing.createSession err`, ex )
@@ -2007,7 +2010,7 @@ const testPing = ( hostIp: string, CallBack ) => {
 	test.fill ( hostIp )
 	saveLog (`start testPing [${ hostIp }]`)
 	return Async.eachSeries ( test, ( n, next ) => {
-		
+		const netPing = require ('net-ping')
 		const session = netPing.createSession ()
 		session.pingHost ( hostIp, ( err, target, sent, rcvd ) => {
 

index.ts

@@ -50,11 +50,11 @@ const handleSquirrelEvent = () => {
       } catch (error) {}
 
       return spawnedProcess;
-    };
-  
+    }
+
     const spawnUpdate = function(args) {
       return spawn(updateDotExe, args);
-    };
+    }
 
     const squirrelEvent = process.argv[1];
     switch (squirrelEvent) {
@@ -86,8 +86,8 @@ const handleSquirrelEvent = () => {
         // we update to the new version - it's the opposite of
         // --squirrel-updated
 
-        app.quit();
-        return true;
+        app.quit()
+        return true
     }
   }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "qtgate",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "license": "MIT",
   "description": "QTGate desktop client",
   "scripts": {
@@ -17,6 +17,9 @@
     "node": ">=50.9"
   },
   "build": {
+    "squirrelWindows": {
+      "remoteReleases": "https://github.com/QTGate/atOPN/releases/download/0.1.0/"
+    },
     "appId": "com.qtgate.client",
     "win": {
       "target": [
@@ -57,13 +60,13 @@
     "cookie-parser": "^1.4.3",
     "express": "^4.16.2",
     "jquery": "^3.2.1",
-    "net-ping": "^1.2.1",
     "node-uuid": "^1.4.8",
     "nodemailer": "^4.4.0",
     "openpgp": "^2.6.0",
     "portastic": "^1.0.1",
     "pug": "^2.0.0-rc.4",
     "raw-socket": "1.5.1",
+    "net-ping": "^1.2.1",
     "socket.io": "^2.0.4"
   }
 }