@zowe/cli 7.0.0-next.202201121428 → 7.0.0-next.202201261615

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.
@@ -141,12 +141,11 @@ class DaemonClient {
141
141
  if (this.pendingStdinLength > 0)
142
142
  return;
143
143
  // Split JSON body and binary data from multipart response
144
- const stringData = data.toString();
145
- const jsonEndIdx = stringData.indexOf("}" + imperative_1.DaemonRequest.EOW_DELIMITER);
144
+ const jsonEndIdx = data.indexOf("}" + imperative_1.DaemonRequest.EOW_DELIMITER);
146
145
  let jsonData;
147
146
  let stdinData;
148
147
  try {
149
- jsonData = JSON.parse(jsonEndIdx !== -1 ? stringData.slice(0, jsonEndIdx + 1) : stringData);
148
+ jsonData = JSON.parse((jsonEndIdx !== -1 ? data.slice(0, jsonEndIdx + 1) : data).toString());
150
149
  stdinData = jsonEndIdx !== -1 ? data.slice(jsonEndIdx + 2) : undefined;
151
150
  }
152
151
  catch (error) {
@@ -155,7 +154,7 @@ class DaemonClient {
155
154
  causeErrors: error
156
155
  }));
157
156
  // eslint-disable-next-line @typescript-eslint/no-magic-numbers
158
- imperative_1.Imperative.api.appLogger.trace("First 1024 bytes of daemon request:\n", stringData.slice(0, 1024));
157
+ imperative_1.Imperative.api.appLogger.trace("First 1024 bytes of daemon request:\n", data.slice(0, 1024).toString());
159
158
  const responsePayload = imperative_1.DaemonRequest.create({
160
159
  stderr: "Failed to parse data received from daemon client:\n" + error.stack,
161
160
  exitCode: 1
@@ -1 +1 @@
1
- {"version":3,"file":"DaemonClient.js","sourceRoot":"","sources":["../../src/daemon/DaemonClient.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;;AAEF,iDAA+F;AAG/F;;;;GAIG;AACH,MAAa,YAAY;IAYrB;;;;;;OAMG;IACH,YAAoB,OAAmB,EAAU,OAAmB,EAAU,MAAc;QAAxE,YAAO,GAAP,OAAO,CAAY;QAAU,YAAO,GAAP,OAAO,CAAY;QAAU,WAAM,GAAN,MAAM,CAAQ;QAZ5F;;WAEG;QACK,uBAAkB,GAAG,CAAC,CAAC;IAU/B,CAAC;IAED;;;OAGG;IACI,GAAG;QACN,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACK,GAAG;QACP,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;IACjE,CAAC;IAED;;;;OAIG;IACK,KAAK;QACT,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACK,QAAQ;QACZ,kFAAkF;QAClF,0FAA0F;QAC1F,8EAA8E;QAC9E,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACW,YAAY,CAAC,IAAY,EAAE,cAAsB;;YAC3D,wFAAwF;YACxF,MAAM,KAAK,GAAQ,OAAO,CAAC,KAAK,CAAC;YACjC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YAEhE,uFAAuF;YACvF,kGAAkG;YAClG,yGAAyG;YACzG,IAAI,KAAK,CAAC,iBAAiB,IAAI,IAAI,EAAE;gBACjC,KAAK,CAAC,iBAAiB,qBAAQ,KAAK,CAAC,cAAc,CAAE,CAAC;aACzD;iBAAM;gBACH,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE;oBAC9B,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;iBACxB;gBACD,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC;gBACnC,KAAK,CAAC,cAAc,qBAAQ,KAAK,CAAC,iBAAiB,CAAE,CAAC;aACzD;YAED,4FAA4F;YAC5F,uFAAuF;YACvF,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,kBAAkB,GAAG,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC;YAE3D,IAAI,IAAI,CAAC,kBAAkB,GAAG,CAAC,EAAE;gBAC7B,kFAAkF;gBAClF,yDAAyD;gBACzD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACxC,MAAM,KAAK,GAAiB,IAAI,CAAC,CAAE,uDAAuD;oBAC1F,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,QAAQ,CAAC,IAAI;wBAC1C,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACzB,KAAK,CAAC,kBAAkB,IAAI,IAAI,CAAC,UAAU,CAAC;wBAE5C,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,EAAE;4BAC/B,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;4BAC/C,OAAO,EAAE,CAAC;yBACb;oBACL,CAAC,CAAC,CAAC;gBACP,CAAC,CAAC,CAAC;aACN;YAED,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;KAAA;IAED;;;;;OAKG;IACW,IAAI,CAAC,IAAY;;YAC3B,IAAI,IAAI,CAAC,kBAAkB,GAAG,CAAC;gBAAE,OAAO;YAExC,0DAA0D;YAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,GAAG,0BAAa,CAAC,aAAa,CAAC,CAAC;YACzE,IAAI,QAAyB,CAAC;YAC9B,IAAI,SAAiB,CAAC;YAEtB,IAAI;gBACA,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBAC5F,SAAS,GAAG,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;aAC1E;YAAC,OAAO,KAAK,EAAE;gBACZ,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,4BAAe,CAAC;oBAClD,GAAG,EAAE,kDAAkD;oBACvD,WAAW,EAAE,KAAK;iBACrB,CAAC,CAAC,CAAC;gBACJ,+DAA+D;gBAC/D,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,uCAAuC,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBACnG,MAAM,eAAe,GAAW,0BAAa,CAAC,MAAM,CAAC;oBACjD,MAAM,EAAE,qDAAqD,GAAG,KAAK,CAAC,KAAK;oBAC3E,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACpC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;gBACnB,OAAO;aACV;YAED,IAAI,WAAW,GAAW,SAAS,CAAC;YACpC,IAAI,QAAQ,CAAC,IAAI,IAAI,IAAI,EAAE;gBACvB,IAAI;oBACA,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;iBACjE;gBAAC,OAAO,GAAG,EAAE;oBACV,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;iBACvF;aACJ;YAED,IAAI,WAAW,IAAI,IAAI,IAAI,WAAW,KAAK,EAAE,EAAE;gBAC3C,+DAA+D;gBAC/D,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;gBAClF,MAAM,eAAe,GAAW,0BAAa,CAAC,MAAM,CAAC;oBACjD,MAAM,EAAE,kFAAkF;oBAC1F,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACpC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;gBACnB,OAAO;aACV;iBAAM,IAAI,WAAW,IAAI,IAAI,CAAC,MAAM,EAAE;gBACnC,mEAAmE;gBACnE,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,GAAG,WAAW,GAAG,yBAAyB,CAAC,CAAC;gBACtF,MAAM,eAAe,GAAW,0BAAa,CAAC,MAAM,CAAC;oBACjD,MAAM,EAAE,YAAY,GAAG,WAAW,GAAG,6BAA6B;oBAClE,QAAQ,EAAE,CAAC;iBACd,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACpC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;gBACnB,OAAO;aACV;YAED,IAAI,QAAQ,CAAC,KAAK,IAAI,IAAI,EAAE;gBACxB,IAAI,QAAQ,CAAC,KAAK,KAAK,YAAY,CAAC,WAAW,EAAE;oBAC7C,yDAAyD;oBACzD,OAAO;iBACV;qBAAM,IAAI,IAAI,CAAC,OAAO,EAAE;oBACrB,mDAAmD;oBACnD,IAAI,CAAC,QAAQ,EAAE,CAAC;iBACnB;aACJ;iBAAM;gBACH,IAAI,SAAS,IAAI,IAAI,EAAE;oBACnB,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;iBAC5D;gBAED,uBAAU,CAAC,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjD,uBAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,yBAAyB,uBAAU,CAAC,WAAW,EAAE,CAAC,CAAC;gBAClF,uBAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,CAAC;aACvF;QACL,CAAC;KAAA;;AAtML,oCAuMC;AAtMG;;;GAGG;AACoB,wBAAW,GAAG,MAAM,CAAC"}
1
+ {"version":3,"file":"DaemonClient.js","sourceRoot":"","sources":["../../src/daemon/DaemonClient.ts"],"names":[],"mappings":"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"}
@@ -47,6 +47,9 @@ class DisableDaemonHandler {
47
47
  return;
48
48
  }
49
49
  cmdParams.response.console.log("Zowe CLI daemon mode is disabled.");
50
+ if (imperative_1.ProcessUtils.getBasicSystemInfo().platform != "win32") {
51
+ cmdParams.response.console.log("To run further Zowe commands, close this terminal and open a new terminal.");
52
+ }
50
53
  cmdParams.response.data.setExitCode(0);
51
54
  });
52
55
  }
@@ -109,13 +112,19 @@ class DisableDaemonHandler {
109
112
  + powerShellHint
110
113
  });
111
114
  }
112
- /* Paths in proc list on Windows sometimes have forward slash
113
- * and sometimes backslash, so allow either.
115
+ /* Paths in proc list on Windows sometimes have forward slash and
116
+ * sometimes backslash, so allow either. This RegEx is designed to
117
+ * match patterns like these:
118
+ *
119
+ * node /home/someUser/.nvm/versions/node/v17.1.0/bin/zowe --daemon
120
+ * node /home/someUser/GitHub/zowe-cli-next/packages/cli/lib/main.js --daemon
121
+ * "C:\Program Files\nodejs\node.exe" "C:\Program Files\nodejs\node_modules\@zowe\cli\lib\main.js" --daemon
114
122
  */
115
- const zoweCmdRegEx = "@zowe[/|\\\\]cli[/|\\\\]lib[/|\\\\]main.js";
123
+ const zoweCmdRegEx = "zowe.*[/|\\\\]cli[/|\\\\]lib[/|\\\\]main.js.* --daemon" + "|" +
124
+ "[/|\\\\]bin[/|\\\\]zowe.* --daemon";
116
125
  // match and kill any running Zowe daemon
117
126
  for (const nextProc of procArray) {
118
- if (nextProc.cmd.match(zoweCmdRegEx) && nextProc.cmd.includes("--daemon")) {
127
+ if (nextProc.cmd.match(zoweCmdRegEx)) {
119
128
  process.kill(nextProc.pid, "SIGINT");
120
129
  }
121
130
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Disable.handler.js","sourceRoot":"","sources":["../../../src/daemon/disable/Disable.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,mCAAmC;AAEnC,iDAG0B;AAE1B;;;;;GAKG;AACH,MAAqB,oBAAoB;IACrC;;;;;;;OAOG;IACU,OAAO,CAAC,SAA6B;;YAC9C,IAAI;gBACA,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;aAC9B;YAAC,OAAM,MAAM,EAAE;gBACZ,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,2CAA2C,GAAI,MAA0B,CAAC,OAAO,CAAC,CAAC;gBAClH,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACvC,OAAO;aACV;YAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;YACpE,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC;KAAA;IAED;;;;;;;YAOQ;IACM,aAAa;;YACvB,sDAAsD;YACtD,IAAI,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,6BAAgB,CAAC,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;YAEpF,2BAA2B;YAC3B,MAAM,OAAO,GAAgB,yBAAY,CAAC,kBAAkB,EAAE,CAAC;YAE/D,iDAAiD;YACjD,QAAQ,OAAO,CAAC,QAAQ,EAAE;gBACtB,KAAK,QAAQ,CAAC;gBACd,KAAK,OAAO,CAAC,CAAC;oBACV,WAAW,IAAI,MAAM,CAAC;oBACtB,MAAM;iBACT;gBACD,KAAK,OAAO,CAAC,CAAC;oBACV,WAAW,IAAI,UAAU,CAAC;oBAC1B,MAAM;iBACT;gBACD,OAAO,CAAC,CAAC;oBACL,MAAM,IAAI,4BAAe,CAAC;wBACtB,GAAG,EAAE,wCAAwC,OAAO,CAAC,QAAQ,qBAAqB;qBACrF,CAAC,CAAC;iBACN;aACJ;YAED,8BAA8B;YAC9B,IAAI,eAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;gBAC5B,eAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;aAC9B;YAED,gCAAgC;YAChC,IAAI,SAAS,CAAC;YACd,IAAI;gBACA,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;gBACzC,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;aACpD;YAAC,OAAM,GAAG,EAAE;gBACT;;;;;;mBAMG;gBACH,IAAI,cAAc,GAAG,EAAE,CAAC;gBACxB,IAAI,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE;oBACvC,cAAc,GAAG,2CAA2C,CAAC;iBAChE;gBACD,MAAM,IAAI,4BAAe,CAAC;oBACtB,GAAG,EAAE,2DAA2D;0BACzD,WAAW,GAAG,EAAE;0BAChB,cAAc;iBACxB,CAAC,CAAC;aACN;YAED;;eAEG;YACH,MAAM,YAAY,GAAG,4CAA4C,CAAC;YAElE,yCAAyC;YACzC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAC9B,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;oBACvE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;iBACxC;aACJ;QACL,CAAC;KAAA;CACJ;AAhGD,uCAgGC"}
1
+ {"version":3,"file":"Disable.handler.js","sourceRoot":"","sources":["../../../src/daemon/disable/Disable.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,mCAAmC;AAEnC,iDAG0B;AAE1B;;;;;GAKG;AACH,MAAqB,oBAAoB;IACrC;;;;;;;OAOG;IACU,OAAO,CAAC,SAA6B;;YAC9C,IAAI;gBACA,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;aAC9B;YAAC,OAAM,MAAM,EAAE;gBACZ,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,2CAA2C,GAAI,MAA0B,CAAC,OAAO,CAAC,CAAC;gBAClH,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACvC,OAAO;aACV;YAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;YACpE,IAAI,yBAAY,CAAC,kBAAkB,EAAE,CAAC,QAAQ,IAAI,OAAO,EAAE;gBACvD,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAC;aAChH;YAED,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC;KAAA;IAED;;;;;;;YAOQ;IACM,aAAa;;YACvB,sDAAsD;YACtD,IAAI,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,6BAAgB,CAAC,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;YAEpF,2BAA2B;YAC3B,MAAM,OAAO,GAAgB,yBAAY,CAAC,kBAAkB,EAAE,CAAC;YAE/D,iDAAiD;YACjD,QAAQ,OAAO,CAAC,QAAQ,EAAE;gBACtB,KAAK,QAAQ,CAAC;gBACd,KAAK,OAAO,CAAC,CAAC;oBACV,WAAW,IAAI,MAAM,CAAC;oBACtB,MAAM;iBACT;gBACD,KAAK,OAAO,CAAC,CAAC;oBACV,WAAW,IAAI,UAAU,CAAC;oBAC1B,MAAM;iBACT;gBACD,OAAO,CAAC,CAAC;oBACL,MAAM,IAAI,4BAAe,CAAC;wBACtB,GAAG,EAAE,wCAAwC,OAAO,CAAC,QAAQ,qBAAqB;qBACrF,CAAC,CAAC;iBACN;aACJ;YAED,8BAA8B;YAC9B,IAAI,eAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;gBAC5B,eAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;aAC9B;YAED,gCAAgC;YAChC,IAAI,SAAS,CAAC;YACd,IAAI;gBACA,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;gBACzC,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;aACpD;YAAC,OAAM,GAAG,EAAE;gBACT;;;;;;mBAMG;gBACH,IAAI,cAAc,GAAG,EAAE,CAAC;gBACxB,IAAI,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE;oBACvC,cAAc,GAAG,2CAA2C,CAAC;iBAChE;gBACD,MAAM,IAAI,4BAAe,CAAC;oBACtB,GAAG,EAAE,2DAA2D;0BACzD,WAAW,GAAG,EAAE;0BAChB,cAAc;iBACxB,CAAC,CAAC;aACN;YAED;;;;;;;eAOG;YACH,MAAM,YAAY,GAAG,wDAAwD,GAAG,GAAG;gBAC9D,oCAAoC,CAAC;YAE1D,yCAAyC;YACzC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAC9B,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;oBAClC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;iBACxC;aACJ;QACL,CAAC;KAAA;CACJ;AA1GD,uCA0GC"}
@@ -0,0 +1,8 @@
1
+ /**
2
+ * Specifies wwhether questions can be asked of the user, and if not,
3
+ * what value should be used for a question when we do not ask.
4
+ */
5
+ export interface IDaemonEnableQuestions {
6
+ canAskUser: boolean;
7
+ addBinToPathVal: string;
8
+ }
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ /*
3
+ * This program and the accompanying materials are made available under the terms of the
4
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
5
+ * https://www.eclipse.org/legal/epl-v20.html
6
+ *
7
+ * SPDX-License-Identifier: EPL-2.0
8
+ *
9
+ * Copyright Contributors to the Zowe Project.
10
+ *
11
+ */
12
+ Object.defineProperty(exports, "__esModule", { value: true });
13
+ //# sourceMappingURL=IDaemonEnableQuestions.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"IDaemonEnableQuestions.js","sourceRoot":"","sources":["../../../src/daemon/doc/IDaemonEnableQuestions.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE"}
@@ -6,6 +6,7 @@ import { ICommandHandler, IHandlerParameters } from "@zowe/imperative";
6
6
  * @implements {ICommandHandler}
7
7
  */
8
8
  export default class EnableDaemonHandler implements ICommandHandler {
9
+ private static openNewTerminalMsg;
9
10
  /**
10
11
  * Process the enable daemon command and populates the response
11
12
  * object as needed.
@@ -21,6 +22,8 @@ export default class EnableDaemonHandler implements ICommandHandler {
21
22
  *
22
23
  * @throws {ImperativeError}
23
24
  *
25
+ * @param {boolean} canAskQuestions Can we interactively ask the user questions?
26
+ *
24
27
  * @returns {string} An informational message to display to the user after
25
28
  * successful completion of the operation.
26
29
  */
@@ -40,4 +43,34 @@ export default class EnableDaemonHandler implements ICommandHandler {
40
43
  * @returns A void promise to synchronize this operation.
41
44
  */
42
45
  private unzipTgz;
46
+ /**
47
+ * Add our .zowe/bin directory to the user's PATH.
48
+ *
49
+ * @param pathToZoweBin The absolute path to our .zowe/bin drectory.
50
+ *
51
+ * @param {IDaemonEnableQuestions} userQuestions Questions for user (if permitted)
52
+ *
53
+ * @returns {string} An informational message to display to the user after
54
+ * successful completion of the operation.
55
+ */
56
+ private addZoweBinToPath;
57
+ /**
58
+ * Add our .zowe/bin directory to the front of the user's PATH on Windows.
59
+ *
60
+ * @param pathToZoweBin The absolute path to our .zowe/bin drectory.
61
+ *
62
+ * @returns {string} An informational message to display to the user after
63
+ * successful completion of the operation.
64
+ */
65
+ private addZoweBinOnWindows;
66
+ /**
67
+ * Add our .zowe/bin directory to the front of the user's PATH on Linux and MAC.
68
+ * Do that by adding a line at the end of the user's .profile file.
69
+ *
70
+ * @param pathToZoweBin The absolute path to our .zowe/bin drectory.
71
+ *
72
+ * @returns {string} An informational message to display to the user after
73
+ * successful completion of the operation.
74
+ */
75
+ private addZoweBinOnPosix;
43
76
  }
@@ -43,14 +43,22 @@ class EnableDaemonHandler {
43
43
  return __awaiter(this, void 0, void 0, function* () {
44
44
  let userMsg;
45
45
  try {
46
- userMsg = yield this.enableDaemon();
46
+ const userQuestions = {
47
+ /* TODO: Use this code block when we are ready to automatically add zowe/bin to the PATH
48
+ canAskUser: true,
49
+ addBinToPathVal: "y"
50
+ */
51
+ canAskUser: false,
52
+ addBinToPathVal: "n"
53
+ };
54
+ userMsg = yield this.enableDaemon(userQuestions);
47
55
  }
48
56
  catch (impErr) {
49
57
  cmdParams.response.console.log("Failed to enable Zowe CLI daemon mode.\n" + impErr.message);
50
58
  cmdParams.response.data.setExitCode(1);
51
59
  return;
52
60
  }
53
- cmdParams.response.console.log("Zowe CLI daemon mode enabled.\n" + userMsg);
61
+ cmdParams.response.console.log("Zowe CLI daemon mode is enabled.\n" + userMsg);
54
62
  cmdParams.response.data.setExitCode(0);
55
63
  });
56
64
  }
@@ -60,11 +68,13 @@ class EnableDaemonHandler {
60
68
  *
61
69
  * @throws {ImperativeError}
62
70
  *
71
+ * @param {boolean} canAskQuestions Can we interactively ask the user questions?
72
+ *
63
73
  * @returns {string} An informational message to display to the user after
64
74
  * successful completion of the operation.
65
75
  */
66
- enableDaemon() {
67
- var _a, _b, _c, _d;
76
+ enableDaemon(userQuestions) {
77
+ var _a, _b;
68
78
  return __awaiter(this, void 0, void 0, function* () {
69
79
  // determine our current OS
70
80
  const sysInfo = imperative_1.ProcessUtils.getBasicSystemInfo();
@@ -98,28 +108,28 @@ class EnableDaemonHandler {
98
108
  });
99
109
  }
100
110
  // form the path to the bin directory in ZOWE_CLI_HOME
101
- const zoweHomeBin = nodeJsPath.normalize(imperative_1.ImperativeConfig.instance.cliHome + "/bin");
111
+ const pathToZoweBin = nodeJsPath.normalize(imperative_1.ImperativeConfig.instance.cliHome + "/bin");
102
112
  // Does the ZOWE_CLI_HOME bin directory exist?
103
- if (imperative_1.IO.existsSync(zoweHomeBin)) {
104
- if (!imperative_1.IO.isDir(zoweHomeBin)) {
113
+ if (imperative_1.IO.existsSync(pathToZoweBin)) {
114
+ if (!imperative_1.IO.isDir(pathToZoweBin)) {
105
115
  throw new imperative_1.ImperativeError({
106
- msg: `The existing file '${zoweHomeBin}' must be a directory.`
116
+ msg: `The existing file '${pathToZoweBin}' must be a directory.`
107
117
  });
108
118
  }
109
119
  }
110
120
  else {
111
121
  // create the directory
112
122
  try {
113
- imperative_1.IO.createDirSync(zoweHomeBin);
123
+ imperative_1.IO.createDirSync(pathToZoweBin);
114
124
  }
115
125
  catch (err) {
116
126
  throw new imperative_1.ImperativeError({
117
- msg: `Unable to create directory '${zoweHomeBin}'.\nReason: ${err}`
127
+ msg: `Unable to create directory '${pathToZoweBin}'.\nReason: ${err}`
118
128
  });
119
129
  }
120
130
  }
121
131
  // extract executable from the tar file into the bin directory
122
- yield this.unzipTgz(preBldTgz, zoweHomeBin, imperative_1.ImperativeConfig.instance.rootCommandName);
132
+ yield this.unzipTgz(preBldTgz, pathToZoweBin, imperative_1.ImperativeConfig.instance.rootCommandName);
123
133
  /* Even though we await the unzip above, the OS still considers the exe file in-use
124
134
  * for a while. We will get the following error message when trying to run the exe.
125
135
  * "The process cannot access the file because it is being used by another process."
@@ -129,11 +139,11 @@ class EnableDaemonHandler {
129
139
  yield imperative_1.CliUtils.sleep(halfSecOfMillis);
130
140
  // display the version of the executable
131
141
  let userInfoMsg = "Zowe CLI native executable version = ";
132
- const zoweExePath = nodeJsPath.resolve(zoweHomeBin, exeFileName);
133
- const pipe = ["pipe", "pipe", process.stderr];
142
+ const zoweExePath = nodeJsPath.resolve(pathToZoweBin, exeFileName);
143
+ const ioOpts = ["pipe", "pipe", "pipe"];
134
144
  try {
135
145
  const spawnResult = child_process_1.spawnSync(zoweExePath, ["--version-exe"], {
136
- stdio: pipe,
146
+ stdio: ioOpts,
137
147
  shell: false
138
148
  });
139
149
  if (spawnResult.stdout) {
@@ -141,21 +151,19 @@ class EnableDaemonHandler {
141
151
  userInfoMsg += spawnResult.stdout.toString().replace(/\r?\n|\r/g, "");
142
152
  }
143
153
  else {
144
- userInfoMsg += "Failed to get version number";
154
+ userInfoMsg += "Failed to get version number\n";
155
+ if (spawnResult.stderr) {
156
+ userInfoMsg += spawnResult.stderr.toString();
157
+ }
145
158
  }
146
159
  }
147
160
  catch (err) {
148
161
  userInfoMsg += err.message;
149
162
  }
150
- // if ZOWE_CLI_HOME/bin is not on our PATH, add an instruction to add it
151
- if (((_b = (_a = process.env) === null || _a === void 0 ? void 0 : _a.PATH) === null || _b === void 0 ? void 0 : _b.length) > 0) {
152
- if (!process.env.PATH.includes(zoweHomeBin)) {
153
- userInfoMsg += `\n\nAdd '${zoweHomeBin}' to your PATH.` +
154
- "\nOtherwise, you will continue to run the classic Zowe CLI interpreter.";
155
- }
156
- }
163
+ // add our bin directory to the PATH if is it is not already there
164
+ userInfoMsg += yield this.addZoweBinToPath(pathToZoweBin, userQuestions);
157
165
  // if ZOWE_USE_DAEMON is set, and turned off, add a warning message
158
- if (((_d = (_c = process.env) === null || _c === void 0 ? void 0 : _c.ZOWE_USE_DAEMON) === null || _d === void 0 ? void 0 : _d.length) > 0) {
166
+ if (((_b = (_a = process.env) === null || _a === void 0 ? void 0 : _a.ZOWE_USE_DAEMON) === null || _b === void 0 ? void 0 : _b.length) > 0) {
159
167
  switch (process.env.ZOWE_USE_DAEMON) {
160
168
  case "no":
161
169
  case "false":
@@ -210,6 +218,122 @@ class EnableDaemonHandler {
210
218
  });
211
219
  });
212
220
  }
221
+ /**
222
+ * Add our .zowe/bin directory to the user's PATH.
223
+ *
224
+ * @param pathToZoweBin The absolute path to our .zowe/bin drectory.
225
+ *
226
+ * @param {IDaemonEnableQuestions} userQuestions Questions for user (if permitted)
227
+ *
228
+ * @returns {string} An informational message to display to the user after
229
+ * successful completion of the operation.
230
+ */
231
+ addZoweBinToPath(pathToZoweBin, userQuestions) {
232
+ var _a;
233
+ return __awaiter(this, void 0, void 0, function* () {
234
+ let userInfoMsg = "";
235
+ const osPlatform = imperative_1.ProcessUtils.getBasicSystemInfo().platform;
236
+ if ((_a = process.env.PATH) === null || _a === void 0 ? void 0 : _a.includes(pathToZoweBin)) {
237
+ // bash & zsh command-path caching forces us to require a new terminal
238
+ if (osPlatform !== "win32") {
239
+ userInfoMsg += "\n\n" + EnableDaemonHandler.openNewTerminalMsg;
240
+ }
241
+ }
242
+ else {
243
+ // ZOWE_CLI_HOME/bin is not on our PATH, we want to add it
244
+ let answer = null;
245
+ if (userQuestions.canAskUser) {
246
+ // alter PATH question by OS
247
+ let pathQuestion = "May we add the Zowe bin directory to your\nPATH in your ";
248
+ if (osPlatform === "win32") {
249
+ pathQuestion += "permanent user environment";
250
+ }
251
+ else {
252
+ pathQuestion += ".profile file";
253
+ }
254
+ pathQuestion += " [y or n] ? ";
255
+ // ask user for permission to update PATH
256
+ answer = yield imperative_1.CliUtils.readPrompt(pathQuestion);
257
+ }
258
+ else {
259
+ // don't ask, just use default
260
+ answer = userQuestions.addBinToPathVal;
261
+ }
262
+ if (answer !== null && answer === "y" || answer === "Y") {
263
+ // user wants us to do it for him/her
264
+ if (osPlatform === "win32") {
265
+ userInfoMsg += yield this.addZoweBinOnWindows(pathToZoweBin);
266
+ }
267
+ else {
268
+ userInfoMsg += this.addZoweBinOnPosix(pathToZoweBin);
269
+ }
270
+ }
271
+ else {
272
+ userInfoMsg += `\n\nManually add '${pathToZoweBin}' to your PATH.` +
273
+ "\nOtherwise, you will continue to run the classic Zowe CLI interpreter.";
274
+ }
275
+ // when zowe/bin not already on path, user needs a new terminal
276
+ userInfoMsg += "\n\n" + EnableDaemonHandler.openNewTerminalMsg;
277
+ } // end zowe/bin not in path
278
+ return userInfoMsg;
279
+ });
280
+ }
281
+ /**
282
+ * Add our .zowe/bin directory to the front of the user's PATH on Windows.
283
+ *
284
+ * @param pathToZoweBin The absolute path to our .zowe/bin drectory.
285
+ *
286
+ * @returns {string} An informational message to display to the user after
287
+ * successful completion of the operation.
288
+ */
289
+ addZoweBinOnWindows(pathToZoweBin) {
290
+ return __awaiter(this, void 0, void 0, function* () {
291
+ let userInfoMsg = "";
292
+ try {
293
+ /* TODO:
294
+ * - Detect if zowe/bin is in system or user PATH env variable
295
+ * - For user PATH : reg query "HKCU\Environment"
296
+ * - For system PATH: reg query "???"
297
+ * - Add zowe/bin to the front of either user or system PATH
298
+ * - confirm that we do not exceed max path (1024 for user)
299
+ * - For system PATH
300
+ * - get user name
301
+ * - prompt for password
302
+ * - Use setx to set the new PATH value
303
+ */
304
+ const ioOptions = ["pipe", "pipe", "pipe"];
305
+ const spawnResult = child_process_1.spawnSync("setx", ["zowe_set_env_test", pathToZoweBin + ";" + process.env.PATH], {
306
+ stdio: ioOptions,
307
+ shell: false
308
+ });
309
+ if (spawnResult.stdout) {
310
+ userInfoMsg += spawnResult.stdout.toString();
311
+ }
312
+ if (spawnResult.stderr) {
313
+ userInfoMsg += spawnResult.stderr.toString();
314
+ }
315
+ }
316
+ catch (err) {
317
+ userInfoMsg += "Failed to run setx. Reason = " + err.message;
318
+ }
319
+ return userInfoMsg;
320
+ });
321
+ }
322
+ /**
323
+ * Add our .zowe/bin directory to the front of the user's PATH on Linux and MAC.
324
+ * Do that by adding a line at the end of the user's .profile file.
325
+ *
326
+ * @param pathToZoweBin The absolute path to our .zowe/bin drectory.
327
+ *
328
+ * @returns {string} An informational message to display to the user after
329
+ * successful completion of the operation.
330
+ */
331
+ addZoweBinOnPosix(pathToZoweBin) {
332
+ // Todo: Implement addZoweBinOnPosix
333
+ const userInfoMsg = "";
334
+ return userInfoMsg;
335
+ }
213
336
  }
214
337
  exports.default = EnableDaemonHandler;
338
+ EnableDaemonHandler.openNewTerminalMsg = "To run further Zowe commands, close this terminal and open a new terminal.";
215
339
  //# sourceMappingURL=Enable.handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Enable.handler.js","sourceRoot":"","sources":["../../../src/daemon/enable/Enable.handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Enable.handler.js","sourceRoot":"","sources":["../../../src/daemon/enable/Enable.handler.ts"],"names":[],"mappings":"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"}
package/lib/imperative.js CHANGED
@@ -368,7 +368,7 @@ const config = {
368
368
  properties: {
369
369
  host: {
370
370
  type: "string",
371
- optionDefinition: zos_uss_for_zowe_sdk_1.SshSession.SSH_OPTION_HOST_PROFILE,
371
+ optionDefinition: zos_uss_for_zowe_sdk_1.SshSession.SSH_OPTION_HOST,
372
372
  includeInTemplate: true
373
373
  },
374
374
  port: {
@@ -378,7 +378,8 @@ const config = {
378
378
  },
379
379
  user: {
380
380
  type: "string",
381
- optionDefinition: zos_uss_for_zowe_sdk_1.SshSession.SSH_OPTION_USER_PROFILE
381
+ secure: true,
382
+ optionDefinition: zos_uss_for_zowe_sdk_1.SshSession.SSH_OPTION_USER
382
383
  },
383
384
  password: {
384
385
  type: "string",
@@ -1 +1 @@
1
- {"version":3,"file":"imperative.js","sourceRoot":"","sources":["../src/imperative.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"imperative.js","sourceRoot":"","sources":["../src/imperative.ts"],"names":[],"mappings":"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"}