adminforth 2.27.0-next.17 → 2.27.0-next.18

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.
Files changed (5) hide show
  1. package/commands/callTsProxy.js +10 -5
  2. package/commands/proxy.ts +18 -10
  3. package/dist/commands/proxy.js +14 -10
  4. package/dist/commands/proxy.js.map +1 -1
  5. package/package.json +1 -1
package/commands/callTsProxy.js CHANGED
@@ -25,11 +25,11 @@ export function callTsProxy(tsCode, silent=false) {
25
25
  const child = spawn("tsx", [path.join(currentFileFolder, "proxy.ts")], {
26
26
  env: process.env,
27
27
  });
28
- let stdout = "";
29
28
  let stderr = "";
29
+ let stdoutLogs = [];
30
30
 
31
31
  child.stdout.on("data", (data) => {
32
- stdout += data;
32
+ stdoutLogs.push(data.toString());
33
33
  });
34
34
 
35
35
  child.stderr.on("data", (data) => {
@@ -39,7 +39,12 @@ export function callTsProxy(tsCode, silent=false) {
39
39
  child.on("close", (code) => {
40
40
  if (code === 0) {
41
41
  try {
42
- const preparedStdout = stdout.slice(stdout.indexOf("{"), stdout.lastIndexOf("}") + 1);
42
+ const tsProxyResult = stdoutLogs.find(log => log.includes('>>>>>>>'));
43
+ const preparedStdout = tsProxyResult.slice(tsProxyResult.indexOf('>>>>>>>') + 46, tsProxyResult.lastIndexOf('<<<<<<<'));
44
+ const preparedStdoutLogs = stdoutLogs.filter(log => !log.includes('>>>>>>>'));
45
+ for (const log of preparedStdoutLogs) {
46
+ console.log(log);
47
+ }
43
48
  const parsed = JSON.parse(preparedStdout);
44
49
  if (!silent) {
45
50
  parsed.capturedLogs.forEach((log) => {
@@ -52,10 +57,10 @@ export function callTsProxy(tsCode, silent=false) {
52
57
  }
53
58
  resolve(parsed.result);
54
59
  } catch (e) {
55
- reject(new Error("Invalid JSON from tsproxy: " + stdout));
60
+ reject(new Error("Invalid JSON from tsproxy: " + preparedStdout));
56
61
  }
57
62
  } else {
58
- console.error(`tsproxy exited with non-0, this should never happen, stdout: ${stdout}, stderr: ${stderr}`);
63
+ console.error(`tsproxy exited with non-0, this should never happen, stdout: ${preparedStdout}, stderr: ${stderr}`);
59
64
  reject(new Error(stderr));
60
65
  }
61
66
  });
package/commands/proxy.ts CHANGED
@@ -41,19 +41,27 @@ import path from 'path';
41
41
 
42
42
  // Restore original console.log
43
43
  console.log = origLog;
44
- console.log(JSON.stringify({
45
- result,
46
- capturedLogs,
47
- error: null
48
- }));
44
+ console.log(
45
+ ">>>>>>>"+
46
+ JSON.stringify({
47
+ result,
48
+ capturedLogs,
49
+ error: null
50
+ })
51
+ +"<<<<<<<"
52
+ );
49
53
  } catch (error: any) {
50
54
  // Restore original console.log
51
55
  console.log = origLog;
52
- console.log(JSON.stringify({
53
- error: error.message,
54
- stack: error.stack,
55
- capturedLogs
56
- }));
56
+ console.log(
57
+ ">>>>>>>"+
58
+ JSON.stringify({
59
+ error: error.message,
60
+ stack: error.stack,
61
+ capturedLogs
62
+ })
63
+ +"<<<<<<<"
64
+ );
57
65
  } finally {
58
66
  await unlink(tmpFile).catch(() => {});
59
67
  }
package/dist/commands/proxy.js CHANGED
@@ -49,20 +49,24 @@ import path from 'path';
49
49
  const result = await Promise.resolve(module.exec());
50
50
  // Restore original console.log
51
51
  console.log = origLog;
52
- console.log(JSON.stringify({
53
- result,
54
- capturedLogs,
55
- error: null
56
- }));
52
+ console.log(">>>>>>>" +
53
+ JSON.stringify({
54
+ result,
55
+ capturedLogs,
56
+ error: null
57
+ })
58
+ + "<<<<<<<");
57
59
  }
58
60
  catch (error) {
59
61
  // Restore original console.log
60
62
  console.log = origLog;
61
- console.log(JSON.stringify({
62
- error: error.message,
63
- stack: error.stack,
64
- capturedLogs
65
- }));
63
+ console.log(">>>>>>>" +
64
+ JSON.stringify({
65
+ error: error.message,
66
+ stack: error.stack,
67
+ capturedLogs
68
+ })
69
+ + "<<<<<<<");
66
70
  }
67
71
  finally {
68
72
  await unlink(tmpFile).catch(() => { });
package/dist/commands/proxy.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../commands/proxy.ts"],"names":[],"mappings":";;;;;;;AAAA,aAAa;AACb,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,CAAC,KAAK,IAAI,EAAE;;IACV,MAAM,MAAM,GAAa,EAAE,CAAC;;QAE5B,KAA0B,eAAA,KAAA,cAAA,OAAO,CAAC,KAAK,CAAA,IAAA,sDAAE,CAAC;YAAhB,cAAa;YAAb,WAAa;YAA5B,MAAM,KAAK,KAAA,CAAA;YACpB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;;;;;;;;;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;IAE9C,MAAM,WAAW,GAAG,gBAAgB,UAAU,EAAE,KAAK,CAAC;IAEtD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,WAAW,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAC5B,IAAI,YAAY,GAAU,EAAE,CAAC;IAC7B,OAAO,CAAC,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;QAC/B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC,CAAA;IAED,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;IACxE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEzF,IAAI,CAAC;QACH,2BAA2B;QAC3B,MAAM,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE/B,8BAA8B;QAC9B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;QAEzD,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAEpD,+BAA+B;QAC/B,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;YACzB,MAAM;YACN,YAAY;YACZ,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC,CAAC;IACN,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,+BAA+B;QAC/B,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;YACzB,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,YAAY;SACb,CAAC,CAAC,CAAC;IACN,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACxC,CAAC;AACH,CAAC,CAAC,EAAE,CAAC"}
1
+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../commands/proxy.ts"],"names":[],"mappings":";;;;;;;AAAA,aAAa;AACb,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,CAAC,KAAK,IAAI,EAAE;;IACV,MAAM,MAAM,GAAa,EAAE,CAAC;;QAE5B,KAA0B,eAAA,KAAA,cAAA,OAAO,CAAC,KAAK,CAAA,IAAA,sDAAE,CAAC;YAAhB,cAAa;YAAb,WAAa;YAA5B,MAAM,KAAK,KAAA,CAAA;YACpB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;;;;;;;;;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;IAE9C,MAAM,WAAW,GAAG,gBAAgB,UAAU,EAAE,KAAK,CAAC;IAEtD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,WAAW,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAC5B,IAAI,YAAY,GAAU,EAAE,CAAC;IAC7B,OAAO,CAAC,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;QAC/B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC,CAAA;IAED,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;IACxE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEzF,IAAI,CAAC;QACH,2BAA2B;QAC3B,MAAM,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE/B,8BAA8B;QAC9B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;QAEzD,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAEpD,+BAA+B;QAC/B,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;QACtB,OAAO,CAAC,GAAG,CACT,SAAS;YACT,IAAI,CAAC,SAAS,CAAC;gBACb,MAAM;gBACN,YAAY;gBACZ,KAAK,EAAE,IAAI;aACZ,CAAC;cACD,SAAS,CACX,CAAC;IACJ,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,+BAA+B;QAC/B,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC;QACtB,OAAO,CAAC,GAAG,CACT,SAAS;YACT,IAAI,CAAC,SAAS,CAAC;gBACb,KAAK,EAAE,KAAK,CAAC,OAAO;gBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,YAAY;aACb,CAAC;cACD,SAAS,CACX,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACxC,CAAC;AACH,CAAC,CAAC,EAAE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "adminforth",
3
- "version": "2.27.0-next.17",
3
+ "version": "2.27.0-next.18",
4
4
  "description": "OpenSource Vue3 powered forth-generation admin panel",
5
5
  "main": "dist/index.js",
6
6
  "module": "dist/index.js",