@lakutata/core 1.0.26 → 1.0.30

package/build/plugins/Formatter.js

@@ -14,24 +14,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Formatter = void 0;
 const Plugin_1 = require("../base/Plugin");
-const moment_1 = __importDefault(require("moment"));
+const moment_timezone_1 = __importDefault(require("moment-timezone"));
 const DependencyInjection_1 = require("../decorators/DependencyInjection");
 class Formatter extends Plugin_1.Plugin {
     constructor() {
         super(...arguments);
         this.dateFormat = 'YYYY-MM-DD HH:mm:ss';
     }
+    get timezone() {
+        return process.env.TZ;
+    }
     asTimestamp(inp = new Date()) {
-        return moment_1.default(inp).unix();
+        return moment_timezone_1.default.tz(inp, this.timezone).unix();
     }
     asMillisecondTimestamp(inp = new Date()) {
-        return moment_1.default(inp).valueOf();
+        return moment_timezone_1.default.tz(inp, this.timezone).valueOf();
     }
     asDate(inp) {
-        return moment_1.default(inp).toDate();
+        return moment_timezone_1.default.tz(inp, this.timezone).toDate();
     }
     asDateText(inp = new Date(), format) {
-        return moment_1.default(inp).format(format ? format : this.dateFormat);
+        return moment_timezone_1.default.tz(inp, this.timezone).format(format ? format : this.dateFormat);
     }
     asPercent(value, decimals = 2) {
         const val = +((value * 100).toFixed(decimals));

package/build/plugins/Formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"Formatter.js","sourceRoot":"","sources":["../../src/plugins/Formatter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqC;AACrC,oDAA2B;AAC3B,2EAA8D;AAQ9D,MAAa,SAAU,SAAQ,eAAM;IAArC;;QAOoB,eAAU,GAAW,qBAAqB,CAAA;IAiD9D,CAAC;IA1CO,WAAW,CAAC,MAA8B,IAAI,IAAI,EAAE;QAC1D,OAAO,gBAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;IAC1B,CAAC;IAOM,sBAAsB,CAAC,MAA8B,IAAI,IAAI,EAAE;QACrE,OAAO,gBAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAA;IAC7B,CAAC;IAOM,MAAM,CAAC,GAA2B;QACxC,OAAO,gBAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAA;IAC5B,CAAC;IAQM,UAAU,CAAC,MAA8B,IAAI,IAAI,EAAE,EAAE,MAAe;QAC1E,OAAO,gBAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC7D,CAAC;IAQM,SAAS,CAAC,KAAa,EAAE,WAAmB,CAAC;QACnD,MAAM,GAAG,GAAW,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;QACtD,OAAO,GAAG,GAAG,GAAG,CAAA;IACjB,CAAC;CACD;AAjDA;IADC,kCAAY,EAAE;;6CAC8C;AAP9D,8BAwDC"}
+{"version":3,"file":"Formatter.js","sourceRoot":"","sources":["../../src/plugins/Formatter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqC;AACrC,sEAA4C;AAC5C,2EAA8D;AAQ9D,MAAa,SAAU,SAAQ,eAAM;IAArC;;QAYoB,eAAU,GAAW,qBAAqB,CAAA;IAiD9D,CAAC;IA3DA,IAAc,QAAQ;QACrB,OAAe,OAAO,CAAC,GAAG,CAAC,EAAE,CAAA;IAC9B,CAAC;IAeM,WAAW,CAAC,MAA8B,IAAI,IAAI,EAAE;QAC1D,OAAO,yBAAc,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAA;IACpD,CAAC;IAOM,sBAAsB,CAAC,MAA8B,IAAI,IAAI,EAAE;QACrE,OAAO,yBAAc,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAA;IACvD,CAAC;IAOM,MAAM,CAAC,GAA2B;QACxC,OAAO,yBAAc,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAA;IACtD,CAAC;IAQM,UAAU,CAAC,MAA8B,IAAI,IAAI,EAAE,EAAE,MAAe;QAC1E,OAAO,yBAAc,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACvF,CAAC;IAQM,SAAS,CAAC,KAAa,EAAE,WAAmB,CAAC;QACnD,MAAM,GAAG,GAAW,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;QACtD,OAAO,GAAG,GAAG,GAAG,CAAA;IACjB,CAAC;CACD;AAjDA;IADC,kCAAY,EAAE;;6CAC8C;AAZ9D,8BA6DC"}

package/build/plugins/Logger.js

@@ -8,6 +8,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = void 0;
 const Plugin_1 = require("../base/Plugin");
@@ -15,6 +18,7 @@ const winston_1 = require("winston");
 const DependencyInjection_1 = require("../decorators/DependencyInjection");
 const util_1 = require("util");
 const transports_1 = require("winston/lib/winston/transports");
+const moment_timezone_1 = __importDefault(require("moment-timezone"));
 class Logger extends Plugin_1.Plugin {
     constructor() {
         super(...arguments);
@@ -22,8 +26,8 @@ class Logger extends Plugin_1.Plugin {
         this.transports = [];
         this.console = {
             silent: false,
-            format: winston_1.format.combine(winston_1.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), winston_1.format.colorize(), winston_1.format.printf(packet => {
-                return `${packet.timestamp} ${packet.level}: ${packet.message}`;
+            format: winston_1.format.combine(winston_1.format.timestamp(), winston_1.format.colorize(), winston_1.format.printf(packet => {
+                return `${moment_timezone_1.default.tz(packet.timestamp, process.env.TZ).format('YYYY-MM-DD HH:mm:ss')} ${packet.level}: ${packet.message}`;
             }))
         };
     }

package/build/plugins/Logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/plugins/Logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/plugins/Logger.ts"],"names":[],"mappings":"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"}

package/build/types/TPluginsConfig.d.ts

@@ -2,5 +2,6 @@ import { IConstructor } from '../interfaces/IConstructor';
 import { Plugin } from '../base/Plugin';
 export declare type TPluginsConfig<TPlugin extends Plugin = Plugin> = ({
     class: IConstructor<TPlugin>;
+    scope?: 'Transient' | 'Singleton';
     [propertyKey: string]: any;
 } | IConstructor<TPlugin>)[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lakutata/core",
-  "version": "1.0.26",
+  "version": "1.0.30",
   "description": "Lakutata Framework Core",
   "main": "./build/Core.js",
   "types": "./build/Core.d.ts",
@@ -54,40 +54,40 @@
   "license": "MIT",
   "dependencies": {
     "@thiagodelgado111/yup-phone": "^0.0.2",
-    "@types/lodash.mapvalues": "^4.6.6",
     "bcryptjs": "^2.4.3",
-    "crypto-js": "^4.0.0",
-    "ergate": "^2.0.10",
+    "crypto-js": "^4.1.1",
     "inversify": "^5.1.1",
-    "is-ssh": "^1.3.2",
+    "is-ssh": "^1.3.3",
     "json-helpers": "^5.1.4",
     "json5": "^2.2.0",
     "lodash.mapvalues": "^4.6.0",
-    "memfs": "^3.2.2",
+    "memfs": "^3.4.0",
     "merge-deep": "^3.0.3",
     "moment": "^2.29.1",
+    "moment-timezone": "^0.5.34",
     "msgpack5": "^5.3.2",
-    "needle": "^2.6.0",
+    "needle": "^2.9.1",
     "node-rsa": "^1.1.1",
     "p-timeout": "^4.1.0",
     "pupa": "^2.1.1",
+    "random": "^3.0.6",
     "reflect-metadata": "^0.1.13",
     "string-random": "^0.1.3",
-    "v8-compile-cache": "^2.3.0",
     "valid-data-url": "^3.0.1",
     "winston": "^3.3.3",
     "winston-transport": "^4.4.0",
-    "yup": "^0.32.9"
+    "yup": "^0.32.11"
   },
   "devDependencies": {
     "@types/bcryptjs": "^2.4.2",
     "@types/chai": "^4.2.14",
-    "@types/crypto-js": "^4.0.1",
+    "@types/crypto-js": "^4.0.2",
     "@types/is-ssh": "^1.3.0",
+    "@types/lodash.mapvalues": "^4.6.6",
     "@types/merge-deep": "^3.0.0",
     "@types/mocha": "^8.2.2",
     "@types/msgpack5": "^3.4.1",
-    "@types/needle": "^2.5.1",
+    "@types/needle": "^2.5.2",
     "@types/node": "^15.12.2",
     "@types/node-rsa": "^1.1.0",
     "@types/valid-data-url": "^2.0.0",

package/src/Application.ts

@@ -13,6 +13,7 @@ import {Logger} from './plugins/Logger'
 import {format} from 'winston'
 import {TProcessesConfig} from './types/TProcessesConfig'
 import {TThreadsConfig} from './types/TThreadsConfig'
+import momentTimezone from 'moment-timezone'
 
 export class Application extends Module {
 	/**
@@ -125,6 +126,18 @@ export class Application extends Module {
 	 */
 	protected readonly workflows: TWorkflowsConfig = []
 
+	/**
+	 * 程序时区
+	 * @type {string}
+	 * @protected
+	 */
+	protected tz: string = (() => {
+		if (!process.env.TZ) {
+			process.env.TZ = momentTimezone.tz.guess()
+		}
+		return process.env.TZ
+	})()
+
 	/**
 	 * 初始化
 	 * @returns {Promise<void>}
@@ -137,6 +150,22 @@ export class Application extends Module {
 		})
 	}
 
+	/**
+	 * 获取程序时区
+	 * @returns {string}
+	 */
+	public getTimezone() {
+		return this.tz
+	}
+
+	/**
+	 * 设置程序时区
+	 * @param {string} tz
+	 */
+	public setTimezone(tz: string) {
+		this.tz = tz
+	}
+
 	/**
 	 * 获取应用程序ID
 	 * @returns {string}

package/src/ApplicationManagement.ts

@@ -1,3 +1,5 @@
+import momentTimezone from 'moment-timezone'
+
 require('events').captureRejections = true
 import {IApplicationConfig} from './interfaces/IApplicationConfig'
 import {Application} from './Application'
@@ -19,6 +21,7 @@ export async function createApp(config: IApplicationConfig): Promise<Application
 		process.title = config.id
 		process.env.appId = config.id
 		process.env.appName = config.name
+		process.env.TZ = config.timezone ? config.timezone : momentTimezone.tz.guess()
 		await coreContainer.initialize()
 		return coreContainer.getModule(Application)
 	} catch (e) {

package/src/base/Container.ts

@@ -83,12 +83,25 @@ export class Container<TObject extends BaseObject = BaseObject, TPlugin extends
 	 * @param {IConstructor<TPlugin>} pluginConstructor
 	 * @param {string} identifier
 	 * @param {object} config
-	 * @param {"Transient" | "Singleton"} scope
 	 */
 	public bindPlugin(pluginConstructor: IConstructor<TPlugin>, identifier: string, config: object): void {
+		const scope = config['scope'] ? config['scope'] : 'Transient'
 		const pluginConfiguration = config ? config : {}
 		if (this.pluginIoC.isBound(identifier)) return
 		const binding = this.pluginIoC.bind(identifier).to(pluginConstructor)
+		switch (scope) {
+			case 'Transient': {
+				binding.inTransientScope()
+			}
+				break
+			case 'Singleton': {
+				binding.inSingletonScope()
+			}
+				break
+			default: {
+				binding.inTransientScope()
+			}
+		}
 		binding.onActivation((context, injectable) => {
 			const onActivationFunc = function (this: TPlugin) {
 				const pluginConfigurationKeys = Object.keys(pluginConfiguration)

package/src/base/abstracts/Module.ts

@@ -160,12 +160,13 @@ export abstract class Module extends BaseObject {
 	 * @protected
 	 */
 	protected bindPlugins(): void {
+		//todo 可能需要合并一下多个相同插件的配置
 		if (!this.plugins) return
 		const reversedPlugins = this.plugins.reverse()
 		const registeredPluginSet = new Set()
 		for (const pluginConstructorOrConfig of reversedPlugins) {
 			let pluginConstructor
-			let pluginConfig: object = {}
+			let pluginConfig: object & { scope?: 'Transient' | 'Singleton' } = {}
 			if (typeof pluginConstructorOrConfig === 'object') {
 				pluginConstructor = pluginConstructorOrConfig.class
 				for (const configKey of Object.keys(pluginConstructorOrConfig)) {

package/src/base/process/Process.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata'
-import {ProcessClass} from 'ergate'
+import {ProcessClass} from '../../lib/multipleRunner/lib/cores/ProcessClass'
 
 export class Process extends ProcessClass {
 	/**

package/src/base/process/ProcessManager.ts

@@ -1,8 +1,8 @@
 import {Process} from './Process'
-import {ProxyClass} from 'ergate'
 import {IProcessConstructor} from '../../interfaces/IProcessConstructor'
-import {Process as processCreate} from 'ergate'
 import {ProcessException} from '../../exceptions/ProcessException'
+import {ProxyClass} from '../../lib/multipleRunner/definitions/interfaces/ProxyClass'
+import {Process as processCreate} from '../../lib/multipleRunner/lib/Process'
 
 export class ProcessManager<TProcess extends Process = Process> {
 	protected readonly processMap: Map<IProcessConstructor<TProcess>, TProcess & ProxyClass> = new Map()

package/src/base/thread/Thread.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata'
-import {ThreadClass} from 'ergate'
+import {ThreadClass} from '../../lib/multipleRunner/lib/cores/ThreadClass'
 
 export class Thread extends ThreadClass {
 

package/src/base/thread/ThreadManager.ts

@@ -1,8 +1,8 @@
 import {Thread} from './Thread'
 import {IThreadConstructor} from '../../interfaces/IThreadConstructor'
-import {Thread as threadCreate} from 'ergate'
 import {ThreadException} from '../../exceptions/ThreadException'
-import {ProxyClass} from 'ergate'
+import {ProxyClass} from '../../lib/multipleRunner/definitions/interfaces/ProxyClass'
+import {Thread as threadCreate} from '../../lib/multipleRunner/lib/Thread'
 
 export class ThreadManager<TThread extends Thread = Thread> {
 	protected readonly threadMap: Map<IThreadConstructor<TThread>, TThread & ProxyClass> = new Map()

package/src/interfaces/IApplicationConfig.ts

@@ -9,6 +9,7 @@ import {TProcessesConfig} from '../types/TProcessesConfig'
 export interface IApplicationConfig {
 	id: string
 	name: string
+	timezone?: string
 	plugins?: TPluginsConfig
 	components?: IComponentsConfig
 	modules?: IModulesConfig

package/src/lib/multipleRunner/constants/Channel.ts

@@ -0,0 +1,5 @@
+export const READY: string = '_____%$ready$%_____'
+export const SETUP_ERROR: string = '_____%$setup_error$%_____'
+export const INVOKE: string = '__%$invoke$%__'
+export const SET_PROPERTY: string = '_____%$set_property$%_____'
+export const PROPERTY_CHANGE: string = '_____%$property_change$%_____'

package/src/lib/multipleRunner/constants/MetadataKey.ts

@@ -0,0 +1,2 @@
+export const MULTIPLE_RUNNER_CLASS_NAME: string = 'multipleRunner::class_name'
+export const MULTIPLE_RUNNER__CLASS_PATH: string = 'multipleRunner::class_path'

package/src/lib/multipleRunner/containers/ContainerVolume.ts

@@ -0,0 +1,83 @@
+import {Volume} from 'memfs'
+
+export const BASE_RUNTIME_CONTAINER_FILE: string = '/multipleRunner/container/base/BaseRuntimeContainer.js'
+export const PROCESS_RUNTIME_CONTAINER_FILE: string = '/multipleRunner/container/ProcessRuntimeContainer.js'
+export const THREAD_RUNTIME_CONTAINER_FILE: string = '/multipleRunner/container/ThreadRuntimeContainer.js'
+
+export const ContainerVolume = Volume.fromJSON({
+	[BASE_RUNTIME_CONTAINER_FILE]: `
+    module.exports.BaseRuntimeContainer = function (bridge) {
+    bridge.on('create', (name, path) => {
+        const module = require(path)[name]
+        const moduleInstance = new module(bridge)
+        moduleInstance.setup().then(() => {
+            const properties = {}
+            const moduleInstancePropertiesObject = {}
+            for (const propertyName of Object.keys(moduleInstance)) {
+                properties[propertyName] = typeof moduleInstance[propertyName]
+                if (propertyName !== '__bridge__')
+                    moduleInstancePropertiesObject[propertyName] = moduleInstance[propertyName]
+            }
+            const moduleInstanceProxy = new Proxy(moduleInstance, {
+                set(target, p, value) {
+                    moduleInstance[p] = value
+                    bridge.propertyChange(p.toString(), value)
+                    return true
+                }
+            })
+            bridge.onSet((property, value) => {
+                moduleInstanceProxy[property] = value
+            })
+            bridge.ready(properties, JSON.parse(JSON.stringify(moduleInstancePropertiesObject)))
+            bridge.onInvoke(async (method, args) => {
+                const _args = []
+                const callbackSignature = /^__________%\\$CALLBACK\\[\\d+]\\$%__________$/
+                for (const arg of args) {
+                    if (typeof arg === 'string' && callbackSignature.test(arg)) {
+                        _args.push((...args) => {
+                            bridge.onCallback(arg, args)
+                        })
+                    } else {
+                        _args.push(arg)
+                    }
+                }
+                return await moduleInstanceProxy[method].apply(moduleInstanceProxy, _args)
+            })
+        }).catch(setupError => {
+            bridge.setupError(setupError)
+            process.exit(1)
+        })
+    })
+}
+    `,
+	[PROCESS_RUNTIME_CONTAINER_FILE]: `
+    const reversedArgvs = process.argv.reverse()
+    require(reversedArgvs[0])
+    const {ProcessBridge} = require(reversedArgvs[0])
+    const {BaseRuntimeContainer} = require(reversedArgvs[1])
+    BaseRuntimeContainer(new ProcessBridge(process))
+    `,
+	[THREAD_RUNTIME_CONTAINER_FILE]: `
+    const reversedArgvs = process.argv.reverse()
+    if(reversedArgvs[3]!=='undefined'){
+        try{require(reversedArgvs[3])}catch(e){}
+    }
+    const {parentPort} = require('worker_threads')
+    let _ThreadBridge
+    try{
+        const {ThreadBridge} = require(reversedArgvs[0])
+        _ThreadBridge = ThreadBridge
+    }catch(e){
+        const tsNodeRegExp=new RegExp("ts-node")
+        for(const reversedArgv of reversedArgvs){
+            if(tsNodeRegExp.test(reversedArgv)){
+                require(reversedArgv)
+            }
+        }
+         const {ThreadBridge} = require(reversedArgvs[0])
+        _ThreadBridge = ThreadBridge
+    }
+    const {BaseRuntimeContainer} = require(reversedArgvs[1])
+    BaseRuntimeContainer(new _ThreadBridge(parentPort))
+    `
+})

package/src/lib/multipleRunner/definitions/interfaces/ClassConstructor.ts

@@ -0,0 +1,3 @@
+export interface ClassConstructor<T> {
+    new(...args: any[]): T
+}

package/src/lib/multipleRunner/definitions/interfaces/MultipleRunnerBaseClassConstructor.ts

@@ -0,0 +1,5 @@
+import {MultipleRunnerBaseClass} from '../../lib/prototypes/MultipleRunnerBaseClass'
+
+export interface MultipleRunnerBaseClassConstructor {
+    new(...args: any[]): MultipleRunnerBaseClass
+}

package/src/lib/multipleRunner/definitions/interfaces/ProcessClassConstructor.ts

@@ -0,0 +1,10 @@
+import {ProcessClass} from '../../lib/cores/ProcessClass'
+import {ClassConstructor} from './ClassConstructor'
+
+export interface ProcessClassConstructor<T extends ProcessClass> extends ClassConstructor<T> {
+    new(...args: any[]): T
+
+    CLASS_PATH: string
+
+    CLASS_NAME: string
+}

package/src/lib/multipleRunner/definitions/interfaces/ProxyClass.ts

@@ -0,0 +1,3 @@
+export interface ProxyClass {
+    terminate(): Promise<void>
+}

package/src/lib/multipleRunner/definitions/interfaces/ThreadClassConstructor.ts

@@ -0,0 +1,10 @@
+import {ThreadClass} from '../../lib/cores/ThreadClass'
+import {ClassConstructor} from './ClassConstructor'
+
+export interface ThreadClassConstructor<T extends ThreadClass> extends ClassConstructor<T> {
+    new(...args: any[]): T
+
+    CLASS_PATH: string
+
+    CLASS_NAME: string
+}

package/src/lib/multipleRunner/lib/Process.ts

@@ -0,0 +1,44 @@
+import 'reflect-metadata'
+import {ProcessClassConstructor} from '../definitions/interfaces/ProcessClassConstructor'
+import {ChildProcess, fork} from 'child_process'
+import path from 'path'
+import {GenerateExecArgv} from './cores/GenerateExecArgv'
+import {ProcessBridge} from './bridges/ProcessBridge'
+import {ProcessClass} from './cores/ProcessClass'
+import {UniParentBridgeHandler} from './cores/UniParentBridgeHandler'
+import {ProxyClass} from '../definitions/interfaces/ProxyClass'
+import {
+    BASE_RUNTIME_CONTAINER_FILE,
+    ContainerVolume,
+    PROCESS_RUNTIME_CONTAINER_FILE
+} from '../containers/ContainerVolume'
+import fs from 'fs'
+import os from 'os'
+
+export async function Process<T extends ProcessClass>(processClassConstructor: ProcessClassConstructor<T>): Promise<T & ProxyClass> {
+    return new Promise((resolve, reject) => {
+        ProcessProxy(processClassConstructor, (setupError, instance) => {
+            if (setupError) {
+                reject(setupError)
+            } else {
+                resolve(<T & ProxyClass>instance)
+            }
+        })
+    })
+}
+
+function ProcessProxy<T extends ProcessClass>(processClassConstructor: ProcessClassConstructor<T>, callback: (setupError: Error, instance: T) => void) {
+    const className: string = processClassConstructor.CLASS_NAME
+    const classPath: string = processClassConstructor.CLASS_PATH
+    const tmpProcessRuntimeContainerFilename: string = path.resolve(os.tmpdir(), `./PRC_TMP_${Date.now()}.tmp`)
+    const tmpBaseRuntimeContainerFilename: string = path.resolve(os.tmpdir(), `./PBRC_TMP_${Date.now()}.tmp`)
+    fs.writeFileSync(tmpBaseRuntimeContainerFilename, ContainerVolume.readFileSync(BASE_RUNTIME_CONTAINER_FILE).toString())
+    fs.writeFileSync(tmpProcessRuntimeContainerFilename, ContainerVolume.readFileSync(PROCESS_RUNTIME_CONTAINER_FILE).toString())
+    const childProcess: ChildProcess = fork(tmpProcessRuntimeContainerFilename, [
+        tmpBaseRuntimeContainerFilename,
+        require.resolve(path.resolve(__dirname, './bridges/ProcessBridge'))
+    ], {
+        execArgv: GenerateExecArgv(classPath)
+    })
+    UniParentBridgeHandler(new ProcessBridge(childProcess), className, classPath, processClassConstructor, callback)
+}

package/src/lib/multipleRunner/lib/Thread.ts

@@ -0,0 +1,52 @@
+import 'reflect-metadata'
+import {ThreadClassConstructor} from '../definitions/interfaces/ThreadClassConstructor'
+import {ThreadClass} from './cores/ThreadClass'
+import {Worker} from 'worker_threads'
+import path from 'path'
+import {ThreadBridge} from './bridges/ThreadBridge'
+import {GenerateExecArgv} from './cores/GenerateExecArgv'
+import {UniParentBridgeHandler} from './cores/UniParentBridgeHandler'
+import {ProxyClass} from '../definitions/interfaces/ProxyClass'
+import os from 'os'
+import fs from 'fs'
+import {
+	BASE_RUNTIME_CONTAINER_FILE,
+	ContainerVolume,
+	THREAD_RUNTIME_CONTAINER_FILE
+} from '../containers/ContainerVolume'
+import {Process} from './Process'
+import {isElectron} from './cores/IsElectron'
+
+export async function Thread<T extends ThreadClass>(threadClassConstructor: ThreadClassConstructor<T>): Promise<T & ProxyClass> {
+	if (isElectron()) {
+		return await Process(threadClassConstructor as any) as any
+	} else {
+		return new Promise((resolve, reject) => {
+			ThreadProxy(threadClassConstructor, (setupError, instance) => {
+				if (setupError) {
+					reject(setupError)
+				} else {
+					resolve(<T & ProxyClass>instance)
+				}
+			})
+		})
+	}
+}
+
+function ThreadProxy<T extends ThreadClass>(threadClassConstructor: ThreadClassConstructor<T>, callback: (setupError: Error, instance: T) => void) {
+	const className: string = threadClassConstructor.CLASS_NAME
+	const classPath: string = threadClassConstructor.CLASS_PATH
+	const tmpBaseRuntimeContainerFilename: string = path.resolve(os.tmpdir(), `./TBRC_TMP_${Date.now()}.tmp`)
+	fs.writeFileSync(tmpBaseRuntimeContainerFilename, ContainerVolume.readFileSync(BASE_RUNTIME_CONTAINER_FILE).toString())
+	const exeArgv = GenerateExecArgv(classPath).reverse()
+	const worker: Worker = new Worker(ContainerVolume.readFileSync(THREAD_RUNTIME_CONTAINER_FILE).toString(), {
+		eval: true,
+		argv: [
+			exeArgv.length > 0 ? exeArgv[0] : 'undefined',
+			tmpBaseRuntimeContainerFilename,
+			require.resolve(path.resolve(__dirname, './bridges/ThreadBridge'))
+		]
+	})
+	// @ts-ignore
+	UniParentBridgeHandler(new ThreadBridge(worker), className, classPath, threadClassConstructor, callback)
+}