ee-core 4.1.3 → 4.1.5

package/cross/cross.js

@@ -106,6 +106,7 @@ class Cross {
 
   // 获取 proc
   getProcByName(name) {
+    // [todo] 如果有名字一样的服务，需要加 pid
     const pid = this.childrenMap[name];
     if (!pid) {
       throw new Error(`[ee-core] [cross] The process named [${name}] does not exit`);

package/loader/index.js

@@ -6,18 +6,19 @@ const { getElectronDir } = require('../ps');
 
 // 加载单个文件(如果是函数，将被执行)
 function loadFile(filepath, ...inject) {
-  const isAbsolute = path.isAbsolute(filepath);
+  let fullpath = filepath;
+  const isAbsolute = path.isAbsolute(fullpath);
   if (!isAbsolute) {
-    filepath = path.join(getElectronDir(), filepath);
+    fullpath = path.join(getElectronDir(), fullpath);
   }
 
-  filepath = filepath && resolveModule(filepath);
-  if (!fs.existsSync(filepath)) {
+  fullpath = fullpath && resolveModule(fullpath);
+  if (!fs.existsSync(fullpath)) {
     let errorMsg = `[ee-core] [loader/index] loadFile ${filepath} does not exist`;
     throw new Error(errorMsg);
   }
 
-  let ret = CoreUtils.loadFile(filepath);
+  let ret = CoreUtils.loadFile(fullpath);
   if (is.function(ret) && !is.class(ret) && !CoreUtils.isBytecodeClass(ret)) {
     ret = ret(...inject);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/utils/index.d.ts

@@ -6,5 +6,6 @@ export declare function isWebProtocol(protocol: string): boolean;
 export declare function isJsProject(baseDir: string): boolean;
 export declare function machineIdSync(original: boolean): any;
 export declare function machineId(original: boolean): Promise<any>;
+export declare function getPlatform(delimiter?: string, isDiffArch?: boolean): string;
 import is = require("./is");
 export { is };

package/utils/index.js

@@ -109,6 +109,36 @@ function machineId(original) {
   });
 }
 
+// get platform 
+// values:  windows | windows_32 | windows_64 | macos_intel | macos_apple | linux
+function getPlatform(delimiter = "_", isDiffArch = false) {
+  let osName = "";
+  if (is.windows()) {
+    osName = "windows";
+    if (isDiffArch) {
+      const arch = is.x64() ? "64" : "32";
+      osName += delimiter + arch;
+    }
+  } else if (is.macOS()) {
+    let isAppleSilicon = false;
+    const cpus = os.cpus();
+    for (let cpu of cpus) {
+      if (cpu.model.includes('Apple')) {
+        isAppleSilicon = true;
+        break;
+      }
+    }
+    const core = isAppleSilicon? "apple" : "intel";
+    osName = "macos" + delimiter + core;
+  } else if (is.linux()) {
+    osName = "linux";
+  }
+
+  return osName;
+}
+
+
+
 function _isWindowsProcessMixedOrNativeArchitecture() {
   // detect if the node binary is the same arch as the Windows OS.
   // or if this is 32 bit node on 64 bit windows.
@@ -162,6 +192,7 @@ module.exports = {
   isJsProject,
   machineIdSync,
   machineId,
+  getPlatform,
   is
 }