ee-core 2.0.0-beta.6 → 2.0.0-beta.7

package/jobs/child/app.js

@@ -1,22 +1,16 @@
 
 const is = require('is-type-of');
-let Exception;
-let Loader;
-let Log;
-let UtilsCore;
+const Exception = require('ee-core/exception');
+const Loader = require('ee-core/loader');
+const Log = require('ee-core/log');
+const UtilsCore = require('../../core/lib/utils');
 
 // 开发环境下，ee-core是soft link
-if (__dirname.indexOf("node_modules") == -1) {
-  Exception = require('../../exception');
-  Loader = require('../../loader');
-  Log = require('../../log');
-  UtilsCore = require('../../core/lib/utils');
-} else {
-  Exception = require('ee-core/exception');
-  Loader = require('ee-core/loader');
-  Log = require('ee-core/log');
-  UtilsCore = require('../../core/lib/utils');
-}
+// /node_modules[\\/]electron[\\/]/.test(process.execPath)
+// const Exception = require('../../exception');
+// const Loader = require('../../loader');
+// const Log = require('../../log');
+// const UtilsCore = require('../../core/lib/utils');
 
 Exception.start();
 

package/jobs/childPool/app.js

@@ -1,22 +1,16 @@
 
 const is = require('is-type-of');
-let Exception;
-let Loader;
-let Log;
-let UtilsCore;
+const Exception = require('ee-core/exception');
+const Loader = require('ee-core/loader');
+const Log = require('ee-core/log');
+const UtilsCore = require('../../core/lib/utils');
 
 // 开发环境下，ee-core是soft link
-if (__dirname.indexOf("node_modules") == -1) {
-  Exception = require('../../exception');
-  Loader = require('../../loader');
-  Log = require('../../log');
-  UtilsCore = require('../../core/lib/utils');
-} else {
-  Exception = require('ee-core/exception');
-  Loader = require('ee-core/loader');
-  Log = require('ee-core/log');
-  UtilsCore = require('../../core/lib/utils');
-}
+// /node_modules[\\/]electron[\\/]/.test(process.execPath)
+// const Exception = require('../../exception');
+// const Loader = require('../../loader');
+// const Log = require('../../log');
+// const UtilsCore = require('../../core/lib/utils');
 
 Exception.start();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -19,8 +19,6 @@
     "depd": "^2.0.0",
     "egg-errors": "^2.3.0",
     "egg-logger": "^2.7.1",
-    "electron-is": "^3.0.0",
-    "electron-updater": "^4.6.1",
     "extend2": "^1.0.1",
     "fs-extra": "^10.0.0",
     "get-port": "^5.1.1",
@@ -35,7 +33,7 @@
     "koa2-cors": "^2.0.6",
     "lodash": "^4.17.21",
     "mkdirp": "^2.1.3",
-    "path-to-regexp": "^6.2.0",
+    "semver": "^7.3.8",
     "serialize-javascript": "^6.0.1",
     "socket.io": "^4.4.1",
     "socket.io-client": "^4.4.1",

package/ps/index.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const eis = require('electron-is');
+const eis = require('../utils/is');
 
 /**
  * 当前进程的所有env

package/utils/is.js

@@ -0,0 +1,145 @@
+'use strict'
+
+const semver = require('semver')
+const gt = semver.gt
+const lt = semver.lt
+const release = require('os').release
+
+const IS = {
+  // Checks if we are in renderer process
+  renderer() {
+    return process.type === 'renderer'
+  },
+  // Checks if we are in main process
+  main() {
+    return process.type === 'browser'
+  },
+  // Checks if we are under Mac OS
+  osx() {
+    return process.platform === 'darwin'
+  },
+  // Checks if we are under Mac OS
+  macOS() {
+    return this.osx()
+  },
+  // Checks if we are under Windows OS
+  windows() {
+    return process.platform === 'win32'
+  },
+  // Checks if we are under Linux OS
+  linux() {
+    return process.platform === 'linux'
+  },
+  // Checks if we are the processor's arch is x86
+  x86() {
+    return process.arch === 'ia32'
+  },
+  // Checks if we are the processor's arch is x64
+  x64() {
+    return process.arch === 'x64'
+  },
+  // Checks if the app is running in a sandbox on macOS
+  sandbox() {
+    return 'APP_SANDBOX_CONTAINER_ID' in process.env
+  },
+  // Checks if the app is running as a Mac App Store build
+  mas() {
+    return process.mas === true
+  },
+  // Checks if the app is running as a Windows Store (appx) build
+  windowsStore() {
+    return process.windowsStore === true
+  },
+  // checks if all the 'is functions' passed as arguments are true
+  all() {
+    const isFunctions = new Array(arguments.length)
+    for (var i = 0; i < isFunctions.length; i++) {
+      isFunctions[i] = arguments[i]
+    }
+    if (!isFunctions.length) return
+    for (i = 0; i < isFunctions.length; i++) {
+      if (!isFunctions[i]()) return false
+    }
+    return true
+  },
+  // checks if all the 'is functions' passed as arguments are false
+  none() {
+    const isFunctions = new Array(arguments.length)
+    for (var i = 0; i < isFunctions.length; i++) {
+      isFunctions[i] = arguments[i]
+    }
+    if (!isFunctions.length) return
+    for (i = 0; i < isFunctions.length; i++) {
+      if (isFunctions[i]()) return false
+    }
+    return true
+  },
+  // returns true if one of the 'is functions' passed as argument is true
+  one() {
+    const isFunctions = new Array(arguments.length)
+    for (var i = 0; i < isFunctions.length; i++) {
+      isFunctions[i] = arguments[i]
+    }
+    if (!isFunctions.length) return
+    for (i = 0; i < isFunctions.length; i++) {
+      if (isFunctions[i]()) return true
+    }
+    return false
+  },
+  // checks the if the given release is the same of the OS
+  release(requested) {
+    if (this.osx()) {
+      return requested === this._osxRelease()
+    } else if (this.windows()) {
+      requested = requested.split('.')
+      const actual = release().split('.')
+      if (requested.length === 2) {
+        return `${actual[0]}.${actual[1]}` === `${requested[0]}.${requested[1]}`
+      }
+      return `${actual[0]}.${actual[1]}.${actual[2]}` === `${requested[0]}.${requested[1]}.${requested[2]}`
+    } else {
+      // Not implemented for Linux yet
+      return null
+    }
+  },
+  // checks if the given release is greater than the current OS release
+  gtRelease(requested) {
+    if (this.osx()) {
+      return gt(requested, this._osxRelease())
+    } else if (this.windows()) {
+      requested = requested.split('.')
+      const actual = release().split('.')
+      if (requested.length === 2) {
+        return gt(`${requested[0]}.${requested[1]}.0`, `${actual[0]}.${actual[1]}.0`)
+      }
+      return gt(`${requested[0]}.${requested[1]}.${requested[2]}`, `${actual[0]}.${actual[1]}.${actual[2]}`)
+    } else {
+      // Not implemented for Linux yet
+      return null
+    }
+  },
+  // checks if the given release is less than the current OS release
+  ltRelease(requested) {
+    if (this.osx()) {
+      return lt(requested, this._osxRelease())
+    } else if (this.windows()) {
+      requested = requested.split('.')
+      const actual = release().split('.')
+      if (requested.length === 2) {
+        return lt(`${requested[0]}.${requested[1]}.0`, `${actual[0]}.${actual[1]}.0`)
+      }
+      return lt(`${requested[0]}.${requested[1]}.${requested[2]}`, `${actual[0]}.${actual[1]}.${actual[2]}`)
+    } else {
+      // Not implemented for Linux yet
+      return null
+    }
+  },
+
+  // returns the current osx release
+  _osxRelease () {
+    const actual = release().split('.')
+    return `10.${actual[0] - 4}.${actual[1]}`
+  }
+}
+
+module.exports = IS;