ee-core 2.9.2-beta.1 → 2.10.0

package/jobs/renderer/index.js

@@ -1,141 +1,141 @@
-const { BrowserWindow } = require('electron');
-const fs = require('fs');
-const LoadView = require('./loadView');
-const Loader = require('../../loader');
-
-class RendererJob {
-
-  /**
-    * constructor
-    * @param  {String} name - job name
-    * @param  {String} filepath - filepath to file
-    * @param  {Object} options - options to create BrowserWindow
-    */
-  constructor(name, filepath, opt = {}) {
-    // TODO Object.assign 只能单层对象结构，多层的对象会直接覆盖
-    let options = Object.assign({
-      show: false,
-      webPreferences: {
-        webSecurity: true,
-        nodeIntegration: true,
-        contextIsolation: false,
-        //enableRemoteModule: true
-      }
-    }, opt);
-
-    this.subWin = new BrowserWindow(options);
-
-    this.jobReady = false;
-    this.exec = Loader.getFullpath(filepath);;
-    this.name = name;
-    this.listeners = [];
-    this.callbacks = [];
-    this.fails = [];
-    this.id = this.subWin.id;
-    this.webSecurity = options.webPreferences.webSecurity;
-
-    // this.callbacks.push(() => {
-    //   MessageChannel.registry(name, this.id, this.subWin.webContents.getOSProcessId());
-    // });
-
-    // job state listener
-    this.subWin.webContents.on('did-finish-load', this._didFinishLoad);
-    this.subWin.webContents.on('did-fail-load', this._didFailLoad);
-
-    // load job
-    this._loadJob(this.exec);
-  }
-
-  /**
-   * 显示开发者工具栏
-   */
-  openDevTools() {
-    this.subWin.webContents.openDevTools({
-      mode: 'undocked'
-    });
-  }
-
-  /**
-   * 窗口加载完成，即业务代码执行完毕
-   */
-  _didFinishLoad = () => {
-    this.jobReady = true;
-    this.callbacks.forEach(callback => {
-      callback(this.id);
-    });
-  }
-
-  /**
-   * 窗口加载失败，即业务运行失败
-   */
-  _didFailLoad = (error) => {
-    this.jobReady = false;
-    this.fails.forEach(handle => {
-      handle(error.toString());
-    });
-  }
-
-
-  /**
-   * 加载任务
-   */
-  _loadJob(filepath) {
-    if (!this.webSecurity) {
-      this._loadURLUnsafe(filepath);
-    } else {
-      this._loadURLSafe(filepath);
-    }
-  }
-
-  /**
-   * 安全的脚本注入
-   */
-  _loadURLSafe(filepath) {
-    return new Promise((resolve, reject) => {
-      fs.readFile(filepath, { encoding: 'utf-8' }, (err, buffer) => {
-        if (err) {
-          reject(err);
-          this._didFailLoad(err);
-          return console.error(err);
-        }
-
-        let param = {
-          webSecurity: true,
-          script: buffer.toString(),
-          title: `${this.name} job`,
-          base: filepath
-        }
-        const viewData = LoadView(param);
-
-        this.subWin.loadURL(viewData)
-        .then(resolve)
-        .catch(err => {
-          reject(err);
-          this._didFailLoad(err);
-          console.error(err);
-        });
-      })
-    })
-  }
-
-  /**
-   * 不安全的脚本注入
-   */
-  _loadURLUnsafe(filepath) {
-    let param = {
-      webSecurity: false,
-      src: this.exec,
-      title: `${this.name} job`,
-      base: filepath
-    }
-    const viewData = LoadView(param);
-
-    this.subWin.loadURL(viewData)
-    .catch(err => {
-      this._didFailLoad(err);
-      console.error(err);
-    });
-  }
-}
-
-module.exports = RendererJob;
+const { BrowserWindow } = require('electron');
+const fs = require('fs');
+const LoadView = require('./loadView');
+const Loader = require('../../loader');
+
+class RendererJob {
+
+  /**
+    * constructor
+    * @param  {String} name - job name
+    * @param  {String} filepath - filepath to file
+    * @param  {Object} options - options to create BrowserWindow
+    */
+  constructor(name, filepath, opt = {}) {
+    // TODO Object.assign 只能单层对象结构，多层的对象会直接覆盖
+    let options = Object.assign({
+      show: false,
+      webPreferences: {
+        webSecurity: true,
+        nodeIntegration: true,
+        contextIsolation: false,
+        //enableRemoteModule: true
+      }
+    }, opt);
+
+    this.subWin = new BrowserWindow(options);
+
+    this.jobReady = false;
+    this.exec = Loader.getFullpath(filepath);;
+    this.name = name;
+    this.listeners = [];
+    this.callbacks = [];
+    this.fails = [];
+    this.id = this.subWin.id;
+    this.webSecurity = options.webPreferences.webSecurity;
+
+    // this.callbacks.push(() => {
+    //   MessageChannel.registry(name, this.id, this.subWin.webContents.getOSProcessId());
+    // });
+
+    // job state listener
+    this.subWin.webContents.on('did-finish-load', this._didFinishLoad);
+    this.subWin.webContents.on('did-fail-load', this._didFailLoad);
+
+    // load job
+    this._loadJob(this.exec);
+  }
+
+  /**
+   * 显示开发者工具栏
+   */
+  openDevTools() {
+    this.subWin.webContents.openDevTools({
+      mode: 'undocked'
+    });
+  }
+
+  /**
+   * 窗口加载完成，即业务代码执行完毕
+   */
+  _didFinishLoad = () => {
+    this.jobReady = true;
+    this.callbacks.forEach(callback => {
+      callback(this.id);
+    });
+  }
+
+  /**
+   * 窗口加载失败，即业务运行失败
+   */
+  _didFailLoad = (error) => {
+    this.jobReady = false;
+    this.fails.forEach(handle => {
+      handle(error.toString());
+    });
+  }
+
+
+  /**
+   * 加载任务
+   */
+  _loadJob(filepath) {
+    if (!this.webSecurity) {
+      this._loadURLUnsafe(filepath);
+    } else {
+      this._loadURLSafe(filepath);
+    }
+  }
+
+  /**
+   * 安全的脚本注入
+   */
+  _loadURLSafe(filepath) {
+    return new Promise((resolve, reject) => {
+      fs.readFile(filepath, { encoding: 'utf-8' }, (err, buffer) => {
+        if (err) {
+          reject(err);
+          this._didFailLoad(err);
+          return console.error(err);
+        }
+
+        let param = {
+          webSecurity: true,
+          script: buffer.toString(),
+          title: `${this.name} job`,
+          base: filepath
+        }
+        const viewData = LoadView(param);
+
+        this.subWin.loadURL(viewData)
+        .then(resolve)
+        .catch(err => {
+          reject(err);
+          this._didFailLoad(err);
+          console.error(err);
+        });
+      })
+    })
+  }
+
+  /**
+   * 不安全的脚本注入
+   */
+  _loadURLUnsafe(filepath) {
+    let param = {
+      webSecurity: false,
+      src: this.exec,
+      title: `${this.name} job`,
+      base: filepath
+    }
+    const viewData = LoadView(param);
+
+    this.subWin.loadURL(viewData)
+    .catch(err => {
+      this._didFailLoad(err);
+      console.error(err);
+    });
+  }
+}
+
+module.exports = RendererJob;

package/jobs/renderer/loadView.js

@@ -1,41 +1,41 @@
-//require('bytenode');
-const Ps = require('../../ps');
-
-/**
-  * loadView 生成BrowserWindow的html content
-  */
-const loadView = function (opt = {}) {
-  const webSecurity = opt.webSecurity;
-  const src = opt.src;
-  const title = opt.title;
-  const script = opt.script;
-
-  //const scriptUrl = new URL('eefile://' + src);
-  const scriptUrl = 'eefile://' + src;
-  console.log('[ee-core:job] scriptUrl: ', scriptUrl);
-
-  // 脚本内容
-  //const scriptBytenode = Ps.isDev() ? '' : `<script> require('bytenode') </script>`;
-  const scriptContent = webSecurity ? `<script> ${ script } </script>` : `<script src='${scriptUrl}'></script>`;
-
-  // html内容
-  const htmlContent = (`
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <title>${title}</title>
-        <meta charset="UTF-8">
-      </head>
-      <body>
-        ${scriptContent}
-      </body>
-    </html>
-  `);
-
-  const DataURI = 'data:text/html;charset=UTF-8,';
-  const data = DataURI + encodeURIComponent(htmlContent);
-
-  return data;
-};
-
+//require('bytenode');
+const Ps = require('../../ps');
+
+/**
+  * loadView 生成BrowserWindow的html content
+  */
+const loadView = function (opt = {}) {
+  const webSecurity = opt.webSecurity;
+  const src = opt.src;
+  const title = opt.title;
+  const script = opt.script;
+
+  //const scriptUrl = new URL('eefile://' + src);
+  const scriptUrl = 'eefile://' + src;
+  console.log('[ee-core:job] scriptUrl: ', scriptUrl);
+
+  // 脚本内容
+  //const scriptBytenode = Ps.isDev() ? '' : `<script> require('bytenode') </script>`;
+  const scriptContent = webSecurity ? `<script> ${ script } </script>` : `<script src='${scriptUrl}'></script>`;
+
+  // html内容
+  const htmlContent = (`
+    <!DOCTYPE html>
+    <html>
+      <head>
+        <title>${title}</title>
+        <meta charset="UTF-8">
+      </head>
+      <body>
+        ${scriptContent}
+      </body>
+    </html>
+  `);
+
+  const DataURI = 'data:text/html;charset=UTF-8,';
+  const data = DataURI + encodeURIComponent(htmlContent);
+
+  return data;
+};
+
 module.exports = loadView;

package/jobs/unification.js

@@ -1,64 +1,64 @@
-const path = require('path');
-const fs = require('fs');
-const RendererJob = require('./renderer');
-const ChildJob = require('./child/pool');
-const Ps = require('../ps');
-const Loader = require('../loader');
-
-class Jobs  {
-  constructor() {
-    this.type;
-    this.dev;
-    this.path;
-    this.instance;
-    this.child;
-    this.childOptions;
-    this.renderer;
-    this.winOptions;
-  }
-
-  /**
-   * 创建 job
-   */
-  create (name, opt = {}) {
-    this.type = opt.type || 'child';
-    this.dev = opt.dev || false;
-    this.winOptions = opt.winOptions || {};
-    this.childOptions = opt.childOptions || {};
-    this.path = opt.path || null;
-
-    const isAbsolute = path.isAbsolute(this.path);
-    if (!isAbsolute) {
-      this.path = path.join(Ps.getBaseDir(), this.path);
-    }
-    const filepath = Loader.resolveModule(this.path);
-
-    if (!fs.existsSync(filepath)) {
-      throw new Error(`[ee-core] [jobs-create] file ${this.path} not exists`);
-    }
-    
-    this.path = filepath;
-    if (this.type == 'child') {
-      this.instance = new ChildJob(name, filepath, this.childOptions);
-      this.child = this.instance;
-    } else if (this.type == 'renderer') {
-      this.instance = new RendererJob(name, filepath, this.winOptions);
-      this.renderer = this.instance;
-
-      if (this.dev) {
-        this.openDevTools();
-      }
-    }
-    
-    return;
-  }
-
-  /**
-   * 显示开发者工具栏（仅支持 RendererJob)
-   */
-  openDevTools () {
-    this.instance.openDevTools();
-  }
-}
-
+const path = require('path');
+const fs = require('fs');
+const RendererJob = require('./renderer');
+const ChildJob = require('./child/pool');
+const Ps = require('../ps');
+const Loader = require('../loader');
+
+class Jobs  {
+  constructor() {
+    this.type;
+    this.dev;
+    this.path;
+    this.instance;
+    this.child;
+    this.childOptions;
+    this.renderer;
+    this.winOptions;
+  }
+
+  /**
+   * 创建 job
+   */
+  create (name, opt = {}) {
+    this.type = opt.type || 'child';
+    this.dev = opt.dev || false;
+    this.winOptions = opt.winOptions || {};
+    this.childOptions = opt.childOptions || {};
+    this.path = opt.path || null;
+
+    const isAbsolute = path.isAbsolute(this.path);
+    if (!isAbsolute) {
+      this.path = path.join(Ps.getBaseDir(), this.path);
+    }
+    const filepath = Loader.resolveModule(this.path);
+
+    if (!fs.existsSync(filepath)) {
+      throw new Error(`[ee-core] [jobs-create] file ${this.path} not exists`);
+    }
+    
+    this.path = filepath;
+    if (this.type == 'child') {
+      this.instance = new ChildJob(name, filepath, this.childOptions);
+      this.child = this.instance;
+    } else if (this.type == 'renderer') {
+      this.instance = new RendererJob(name, filepath, this.winOptions);
+      this.renderer = this.instance;
+
+      if (this.dev) {
+        this.openDevTools();
+      }
+    }
+    
+    return;
+  }
+
+  /**
+   * 显示开发者工具栏（仅支持 RendererJob)
+   */
+  openDevTools () {
+    this.instance.openDevTools();
+  }
+}
+
 module.exports = Jobs;