@lakutata/core 1.0.43 → 1.0.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/decorators/MethodValidation.js +2 -2
- package/build/decorators/MethodValidation.js.map +1 -1
- package/build/lib/multipleRunner/lib/Process.js +2 -1
- package/build/lib/multipleRunner/lib/Process.js.map +1 -1
- package/build/lib/multipleRunner/lib/bridges/BaseBridge.js +4 -4
- package/build/lib/multipleRunner/lib/bridges/BaseBridge.js.map +1 -1
- package/package.json +6 -6
- package/src/decorators/MethodValidation.ts +2 -2
- package/src/lib/multipleRunner/lib/Process.ts +26 -25
- package/src/lib/multipleRunner/lib/bridges/BaseBridge.ts +4 -4
- package/src/tests/modules/Test3.ts +6 -2
|
@@ -45,7 +45,7 @@ const Return = (returnSchema, options = {
|
|
|
45
45
|
};
|
|
46
46
|
exports.Return = Return;
|
|
47
47
|
const Accept = (argumentSchemas, options = {
|
|
48
|
-
strict:
|
|
48
|
+
strict: false,
|
|
49
49
|
stripUnknown: true
|
|
50
50
|
}) => {
|
|
51
51
|
return (target, propertyKey, descriptor) => {
|
|
@@ -55,7 +55,7 @@ const Accept = (argumentSchemas, options = {
|
|
|
55
55
|
const schemas = Array.isArray(argumentSchemas) ? argumentSchemas : [argumentSchemas];
|
|
56
56
|
try {
|
|
57
57
|
for (let argumentIndex = 0; argumentIndex < schemas.length; argumentIndex++) {
|
|
58
|
-
schemas[argumentIndex].label(`Method [${propertyKey}] accept argument[${argumentIndex}]`).validateSync(args[argumentIndex], options);
|
|
58
|
+
args[argumentIndex] = schemas[argumentIndex].label(`Method [${propertyKey}] accept argument[${argumentIndex}]`).validateSync(args[argumentIndex], options);
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MethodValidation.js","sourceRoot":"","sources":["../../src/decorators/MethodValidation.ts"],"names":[],"mappings":";;;AACA,6FAAuF;AACvF,6FAAuF;AAShF,MAAM,MAAM,GAAG,CAAC,YAAuB,EAAE,UAAwD;IACvG,MAAM,EAAE,IAAI;IACZ,YAAY,EAAE,IAAI;CAClB,EAAE,EAAE;IACJ,OAAO,CAAC,MAAc,EAAE,WAAmB,EAAE,UAA2E,EAAE,EAAE;QAC3H,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAA;QAC3B,MAAM,cAAc,GAA2C,UAAU,CAAC,KAAY,CAAA;QACtF,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,WAAW,WAAW,gBAAgB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,WAAW,WAAW,iBAAiB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAA;QAC9J,UAAU,CAAC,KAAK,GAAG,UAAU,GAAG,IAAW;YAC1C,MAAM,oBAAoB,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC7D,IAAI,oBAAoB,YAAY,OAAO,EAAE;gBAC5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACtC,OAAO,oBAAoB,CAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE;wBAC5D,IAAI;4BACH,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAA;4BAClF,OAAO,CAAC,YAAY,CAAC,CAAA;yBACrB;wBAAC,OAAO,CAAC,EAAE;4BACX,MAAM,CAAC,IAAI,2DAA4B,CAAE,CAAW,CAAC,OAAO,CAAC,CAAC,CAAA;yBAC9D;oBACF,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBACjB,CAAC,CAAC,CAAA;aACF;iBAAM;gBACN,IAAI;oBACH,OAAO,YAAY,CAAC,YAAY,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;iBAC/D;gBAAC,OAAO,CAAC,EAAE;oBACX,IAAI,MAAM,CAAC,mBAAmB,CAAC,EAAE;wBAChC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,2DAA4B,EAAG,CAAW,CAAC,OAAO,CAAC,CAAA;qBACrF;yBAAM;wBACN,MAAM,IAAI,2DAA4B,CAAE,CAAW,CAAC,OAAO,CAAC,CAAA;qBAC5D;iBACD;aACD;QACF,CAAC,CAAA;QACD,OAAO,UAAU,CAAA;IAClB,CAAC,CAAA;AACF,CAAC,CAAA;AAnCY,QAAA,MAAM,UAmClB;AASM,MAAM,MAAM,GAAG,CAAC,eAAwC,EAAE,UAAwD;IACxH,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"MethodValidation.js","sourceRoot":"","sources":["../../src/decorators/MethodValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,8 @@ function ProcessProxy(processClassConstructor, callback) {
|
|
|
37
37
|
tmpBaseRuntimeContainerFilename,
|
|
38
38
|
require.resolve(path_1.default.resolve(__dirname, './bridges/ProcessBridge'))
|
|
39
39
|
], {
|
|
40
|
-
execArgv: (0, GenerateExecArgv_1.GenerateExecArgv)(classPath)
|
|
40
|
+
execArgv: (0, GenerateExecArgv_1.GenerateExecArgv)(classPath),
|
|
41
|
+
serialization: 'advanced'
|
|
41
42
|
});
|
|
42
43
|
(0, UniParentBridgeHandler_1.UniParentBridgeHandler)(new ProcessBridge_1.ProcessBridge(childProcess), className, classPath, processClassConstructor, callback);
|
|
43
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Process.js","sourceRoot":"","sources":["../../../../src/lib/multipleRunner/lib/Process.ts"],"names":[],"mappings":";;;;;;AAAA,4BAAyB;AAEzB,iDAAgD;AAChD,gDAAuB;AACvB,+DAAyD;AACzD,2DAAqD;AAErD,2EAAqE;AAErE,mEAIsC;AACtC,4CAAmB;AACnB,4CAAmB;AAEZ,KAAK,UAAU,OAAO,CAAyB,uBAAmD;
|
|
1
|
+
{"version":3,"file":"Process.js","sourceRoot":"","sources":["../../../../src/lib/multipleRunner/lib/Process.ts"],"names":[],"mappings":";;;;;;AAAA,4BAAyB;AAEzB,iDAAgD;AAChD,gDAAuB;AACvB,+DAAyD;AACzD,2DAAqD;AAErD,2EAAqE;AAErE,mEAIsC;AACtC,4CAAmB;AACnB,4CAAmB;AAEZ,KAAK,UAAU,OAAO,CAAyB,uBAAmD;IACxG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,YAAY,CAAC,uBAAuB,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC9D,IAAI,UAAU,EAAE;gBACf,MAAM,CAAC,UAAU,CAAC,CAAA;aAClB;iBAAM;gBACN,OAAO,CAAiB,QAAQ,CAAC,CAAA;aACjC;QACF,CAAC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACH,CAAC;AAVD,0BAUC;AAED,SAAS,YAAY,CAAyB,uBAAmD,EAAE,QAAkD;IACpJ,MAAM,SAAS,GAAW,uBAAuB,CAAC,UAAU,CAAA;IAC5D,MAAM,SAAS,GAAW,uBAAuB,CAAC,UAAU,CAAA;IAC5D,MAAM,kCAAkC,GAAW,cAAI,CAAC,OAAO,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,aAAa,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAC3G,MAAM,+BAA+B,GAAW,cAAI,CAAC,OAAO,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,cAAc,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IACzG,YAAE,CAAC,aAAa,CAAC,+BAA+B,EAAE,iCAAe,CAAC,YAAY,CAAC,6CAA2B,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IACvH,YAAE,CAAC,aAAa,CAAC,kCAAkC,EAAE,iCAAe,CAAC,YAAY,CAAC,gDAA8B,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC7H,MAAM,YAAY,GAAiB,IAAA,oBAAI,EAAC,kCAAkC,EAAE;QAC3E,+BAA+B;QAC/B,OAAO,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;KACnE,EAAE;QACF,QAAQ,EAAE,IAAA,mCAAgB,EAAC,SAAS,CAAC;QACrC,aAAa,EAAE,UAAU;KACzB,CAAC,CAAA;IACF,IAAA,+CAAsB,EAAC,IAAI,6BAAa,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,CAAC,CAAA;AACjH,CAAC"}
|
|
@@ -51,9 +51,9 @@ class BaseBridge {
|
|
|
51
51
|
return new Promise((resolve, reject) => {
|
|
52
52
|
const invokeId = `ts_${Date.now()}_rnd_${random_1.default.int(100, 999999)}`;
|
|
53
53
|
const responseChannelName = `__%$invoke_res_${invokeId}$%__`;
|
|
54
|
-
this.once(responseChannelName, (
|
|
55
|
-
if (
|
|
56
|
-
reject(
|
|
54
|
+
this.once(responseChannelName, (invokeError, result) => {
|
|
55
|
+
if (invokeError) {
|
|
56
|
+
reject(invokeError);
|
|
57
57
|
}
|
|
58
58
|
else {
|
|
59
59
|
resolve(result);
|
|
@@ -67,7 +67,7 @@ class BaseBridge {
|
|
|
67
67
|
handler(method, args).then(result => {
|
|
68
68
|
this.send(responseChannelName, null, result);
|
|
69
69
|
}).catch(invokeError => {
|
|
70
|
-
this.send(responseChannelName, invokeError
|
|
70
|
+
this.send(responseChannelName, invokeError, undefined);
|
|
71
71
|
});
|
|
72
72
|
});
|
|
73
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseBridge.js","sourceRoot":"","sources":["../../../../../src/lib/multipleRunner/lib/bridges/BaseBridge.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAmC;AACnC,oDAA2B;AAC3B,qDAAiG;AAEjG,MAAa,UAAU;IAItB,YAAY,YAAiB;QAHV,iBAAY,GAAiB,IAAI,qBAAY,EAAE,CAAA;QAIjE,IAAI,CAAC,MAAM,GAAG,YAAY,CAAA;QAC1B,IAAI,CAAC,MAAM;aACT,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE;YACrB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAQ,CAAC,CAAA;QACzF,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE;QAC3B,CAAC,CAAC,CAAA;IACJ,CAAC;IAEM,GAAG,CAAC,OAAe;QACzB,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QAC7C,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,EAAE,CAAC,OAAe,EAAE,QAAkC;QAC5D,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;QAClE,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,QAAkC;QAC9D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;QACpE,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,GAAG,IAAW;QAC1C,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;IAC9C,CAAC;IAEM,KAAK,CAAC,UAAkC,EAAE,cAAsC;QACtF,IAAI,CAAC,IAAI,CAAC,eAAK,EAAE,UAAU,EAAE,cAAc,CAAC,CAAA;QAC5C,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,OAAO,CAAC,QAA8F;QAC5G,IAAI,CAAC,IAAI,CAAC,eAAK,EAAE,QAAQ,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,KAAK,CAAC,KAAY;QACxB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IAClC,CAAC;IAEM,UAAU,CAAC,KAAY;QAC7B,IAAI,CAAC,IAAI,CAAC,qBAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,IAAgB;QACnD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,MAAM,QAAQ,GAAW,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,gBAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CAAA;YAC1E,MAAM,mBAAmB,GAAW,kBAAkB,QAAQ,MAAM,CAAA;YACpE,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"BaseBridge.js","sourceRoot":"","sources":["../../../../../src/lib/multipleRunner/lib/bridges/BaseBridge.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAmC;AACnC,oDAA2B;AAC3B,qDAAiG;AAEjG,MAAa,UAAU;IAItB,YAAY,YAAiB;QAHV,iBAAY,GAAiB,IAAI,qBAAY,EAAE,CAAA;QAIjE,IAAI,CAAC,MAAM,GAAG,YAAY,CAAA;QAC1B,IAAI,CAAC,MAAM;aACT,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE;YACrB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAQ,CAAC,CAAA;QACzF,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE;QAC3B,CAAC,CAAC,CAAA;IACJ,CAAC;IAEM,GAAG,CAAC,OAAe;QACzB,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QAC7C,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,EAAE,CAAC,OAAe,EAAE,QAAkC;QAC5D,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;QAClE,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,QAAkC;QAC9D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;QACpE,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,GAAG,IAAW;QAC1C,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;IAC9C,CAAC;IAEM,KAAK,CAAC,UAAkC,EAAE,cAAsC;QACtF,IAAI,CAAC,IAAI,CAAC,eAAK,EAAE,UAAU,EAAE,cAAc,CAAC,CAAA;QAC5C,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,OAAO,CAAC,QAA8F;QAC5G,IAAI,CAAC,IAAI,CAAC,eAAK,EAAE,QAAQ,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,KAAK,CAAC,KAAY;QACxB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IAClC,CAAC;IAEM,UAAU,CAAC,KAAY;QAC7B,IAAI,CAAC,IAAI,CAAC,qBAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,IAAgB;QACnD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,MAAM,QAAQ,GAAW,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,gBAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CAAA;YAC1E,MAAM,mBAAmB,GAAW,kBAAkB,QAAQ,MAAM,CAAA;YACpE,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,WAAkB,EAAE,MAAW,EAAE,EAAE;gBAClE,IAAI,WAAW,EAAE;oBAChB,MAAM,CAAC,WAAW,CAAC,CAAA;iBACnB;qBAAM;oBACN,OAAO,CAAC,MAAM,CAAC,CAAA;iBACf;YACF,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,IAAI,CAAC,gBAAM,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,CAAC,CAAA;QACrD,CAAC,CAAC,CAAA;IACH,CAAC;IAEM,QAAQ,CAAC,OAA2D;QAC1E,IAAI,CAAC,EAAE,CAAC,gBAAM,EAAE,CAAC,MAAc,EAAE,IAAgB,EAAE,mBAA2B,EAAE,EAAE;YACjF,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACnC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;YAC7C,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;gBACtB,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,WAAW,EAAE,SAAS,CAAC,CAAA;YACvD,CAAC,CAAC,CAAA;QACH,CAAC,CAAC,CAAA;IACH,CAAC;IAEM,GAAG,CAAC,QAAgB,EAAE,KAAU;QACtC,IAAI,CAAC,IAAI,CAAC,sBAAY,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;QACxC,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,KAAK,CAAC,OAA+C;QAC3D,IAAI,CAAC,EAAE,CAAC,sBAAY,EAAE,OAAO,CAAC,CAAA;QAC9B,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,cAAc,CAAC,QAAgB,EAAE,KAAU;QACjD,IAAI,CAAC,IAAI,CAAC,yBAAe,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;QAC3C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;QAC9C,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,iBAAiB,CAAC,OAA+C;QACvE,IAAI,CAAC,EAAE,CAAC,yBAAe,EAAE,OAAO,CAAC,CAAA;QACjC,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,eAAe,CAAC,OAAY,EAAE,OAAgC;QACpE,MAAM,eAAe,GAAW,wBAAwB,IAAI,CAAC,GAAG,EAAE,eAAe,CAAA;QACjF,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE;YAC7C,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;QACF,OAAO,eAAe,CAAA;IACvB,CAAC;IAEM,UAAU,CAAC,eAAuB,EAAE,IAAW;QACrD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,IAAI,CAAQ,CAAC,CAAA;QAC5D,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,KAAK,CAAC,SAAS;QACrB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;IAC9C,CAAC;CACD;AAjHD,gCAiHC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lakutata/core",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.46",
|
|
4
4
|
"description": "Lakutata Framework Core",
|
|
5
5
|
"main": "./build/Core.js",
|
|
6
6
|
"types": "./build/Core.d.ts",
|
|
@@ -59,21 +59,21 @@
|
|
|
59
59
|
"inversify": "^6.0.1",
|
|
60
60
|
"is-ssh": "^1.3.3",
|
|
61
61
|
"json-helpers": "^5.2.0",
|
|
62
|
-
"json5": "^2.2.
|
|
62
|
+
"json5": "^2.2.1",
|
|
63
63
|
"lodash.mapvalues": "^4.6.0",
|
|
64
64
|
"memfs": "^3.4.1",
|
|
65
65
|
"merge-deep": "^3.0.3",
|
|
66
|
-
"moment": "^2.29.
|
|
66
|
+
"moment": "^2.29.3",
|
|
67
67
|
"moment-timezone": "^0.5.34",
|
|
68
|
-
"msgpack5": "^
|
|
69
|
-
"needle": "^3.
|
|
68
|
+
"msgpack5": "^6.0.0",
|
|
69
|
+
"needle": "^3.1.0",
|
|
70
70
|
"node-rsa": "^1.1.1",
|
|
71
71
|
"p-timeout": "^4.1.0",
|
|
72
72
|
"pupa": "^2.1.1",
|
|
73
73
|
"random": "^3.0.6",
|
|
74
74
|
"reflect-metadata": "^0.1.13",
|
|
75
75
|
"string-random": "^0.1.3",
|
|
76
|
-
"winston": "^3.
|
|
76
|
+
"winston": "^3.7.2",
|
|
77
77
|
"winston-transport": "^4.5.0",
|
|
78
78
|
"yup": "^0.32.11"
|
|
79
79
|
},
|
|
@@ -54,7 +54,7 @@ export const Return = (returnSchema: AnySchema, options: { strict?: boolean, str
|
|
|
54
54
|
* @constructor
|
|
55
55
|
*/
|
|
56
56
|
export const Accept = (argumentSchemas: AnySchema | AnySchema[], options: { strict?: boolean, stripUnknown?: boolean } = {
|
|
57
|
-
strict:
|
|
57
|
+
strict: false,
|
|
58
58
|
stripUnknown: true
|
|
59
59
|
}) => {
|
|
60
60
|
return (target: Object, propertyKey: string, descriptor: TypedPropertyDescriptor<(...args: any[]) => any | Promise<any>>) => {
|
|
@@ -64,7 +64,7 @@ export const Accept = (argumentSchemas: AnySchema | AnySchema[], options: { stri
|
|
|
64
64
|
const schemas: AnySchema[] = Array.isArray(argumentSchemas) ? argumentSchemas : [argumentSchemas]
|
|
65
65
|
try {
|
|
66
66
|
for (let argumentIndex = 0; argumentIndex < schemas.length; argumentIndex++) {
|
|
67
|
-
schemas[argumentIndex].label(`Method [${propertyKey}] accept argument[${argumentIndex}]`).validateSync(args[argumentIndex], options)
|
|
67
|
+
args[argumentIndex] = schemas[argumentIndex].label(`Method [${propertyKey}] accept argument[${argumentIndex}]`).validateSync(args[argumentIndex], options)
|
|
68
68
|
}
|
|
69
69
|
} catch (e) {
|
|
70
70
|
if (target['generateException']) {
|
|
@@ -8,37 +8,38 @@ import {ProcessClass} from './cores/ProcessClass'
|
|
|
8
8
|
import {UniParentBridgeHandler} from './cores/UniParentBridgeHandler'
|
|
9
9
|
import {ProxyClass} from '../definitions/interfaces/ProxyClass'
|
|
10
10
|
import {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
BASE_RUNTIME_CONTAINER_FILE,
|
|
12
|
+
ContainerVolume,
|
|
13
|
+
PROCESS_RUNTIME_CONTAINER_FILE
|
|
14
14
|
} from '../containers/ContainerVolume'
|
|
15
15
|
import fs from 'fs'
|
|
16
16
|
import os from 'os'
|
|
17
17
|
|
|
18
18
|
export async function Process<T extends ProcessClass>(processClassConstructor: ProcessClassConstructor<T>): Promise<T & ProxyClass> {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
19
|
+
return new Promise((resolve, reject) => {
|
|
20
|
+
ProcessProxy(processClassConstructor, (setupError, instance) => {
|
|
21
|
+
if (setupError) {
|
|
22
|
+
reject(setupError)
|
|
23
|
+
} else {
|
|
24
|
+
resolve(<T & ProxyClass>instance)
|
|
25
|
+
}
|
|
26
|
+
})
|
|
27
|
+
})
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
function ProcessProxy<T extends ProcessClass>(processClassConstructor: ProcessClassConstructor<T>, callback: (setupError: Error, instance: T) => void) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
31
|
+
const className: string = processClassConstructor.CLASS_NAME
|
|
32
|
+
const classPath: string = processClassConstructor.CLASS_PATH
|
|
33
|
+
const tmpProcessRuntimeContainerFilename: string = path.resolve(os.tmpdir(), `./PRC_TMP_${Date.now()}.tmp`)
|
|
34
|
+
const tmpBaseRuntimeContainerFilename: string = path.resolve(os.tmpdir(), `./PBRC_TMP_${Date.now()}.tmp`)
|
|
35
|
+
fs.writeFileSync(tmpBaseRuntimeContainerFilename, ContainerVolume.readFileSync(BASE_RUNTIME_CONTAINER_FILE).toString())
|
|
36
|
+
fs.writeFileSync(tmpProcessRuntimeContainerFilename, ContainerVolume.readFileSync(PROCESS_RUNTIME_CONTAINER_FILE).toString())
|
|
37
|
+
const childProcess: ChildProcess = fork(tmpProcessRuntimeContainerFilename, [
|
|
38
|
+
tmpBaseRuntimeContainerFilename,
|
|
39
|
+
require.resolve(path.resolve(__dirname, './bridges/ProcessBridge'))
|
|
40
|
+
], {
|
|
41
|
+
execArgv: GenerateExecArgv(classPath),
|
|
42
|
+
serialization: 'advanced'
|
|
43
|
+
})
|
|
44
|
+
UniParentBridgeHandler(new ProcessBridge(childProcess), className, classPath, processClassConstructor, callback)
|
|
44
45
|
}
|
|
@@ -57,9 +57,9 @@ export class BaseBridge {
|
|
|
57
57
|
return new Promise((resolve, reject) => {
|
|
58
58
|
const invokeId: string = `ts_${Date.now()}_rnd_${random.int(100, 999999)}`
|
|
59
59
|
const responseChannelName: string = `__%$invoke_res_${invokeId}$%__`
|
|
60
|
-
this.once(responseChannelName, (
|
|
61
|
-
if (
|
|
62
|
-
reject(
|
|
60
|
+
this.once(responseChannelName, (invokeError: Error, result: any) => {
|
|
61
|
+
if (invokeError) {
|
|
62
|
+
reject(invokeError)
|
|
63
63
|
} else {
|
|
64
64
|
resolve(result)
|
|
65
65
|
}
|
|
@@ -73,7 +73,7 @@ export class BaseBridge {
|
|
|
73
73
|
handler(method, args).then(result => {
|
|
74
74
|
this.send(responseChannelName, null, result)
|
|
75
75
|
}).catch(invokeError => {
|
|
76
|
-
this.send(responseChannelName, invokeError
|
|
76
|
+
this.send(responseChannelName, invokeError, undefined)
|
|
77
77
|
})
|
|
78
78
|
})
|
|
79
79
|
}
|
|
@@ -26,9 +26,13 @@ export class Test3 extends Module {
|
|
|
26
26
|
return this.testVal
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
@Accept(Validator.Object({
|
|
29
|
+
@Accept(Validator.Object({
|
|
30
|
+
test: Validator.Bool.notRequired().default(false),
|
|
31
|
+
bbc:Validator.String.notRequired().default('aaacccc')
|
|
32
|
+
}))
|
|
30
33
|
@Return(Validator.Bool.required())
|
|
31
34
|
public ttttt(inp: { test?: any }): any {
|
|
35
|
+
console.log('ttttt@@@@@Accept:',inp)
|
|
32
36
|
return !!inp.test
|
|
33
37
|
}
|
|
34
38
|
|
|
@@ -47,4 +51,4 @@ export class Test3 extends Module {
|
|
|
47
51
|
protected readonly workflows: TWorkflowsConfig
|
|
48
52
|
protected readonly threads: TThreadsConfig = []
|
|
49
53
|
protected readonly processes: TProcessesConfig = []
|
|
50
|
-
}
|
|
54
|
+
}
|