@upsoft/patchkit-launcher-runtime-base 2.0.0-alpha.14 → 2.0.0-alpha.19
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/dist/check-apps-branches-process.js +1 -1
- package/dist/check-apps-branches-process.js.map +1 -1
- package/dist/display-select-app-branch-root-dir-dialog.js +2 -2
- package/dist/display-select-app-branch-root-dir-dialog.js.map +1 -1
- package/dist/fetch-app-branch-default-root-dir-path.d.ts.map +1 -1
- package/dist/fetch-app-branch-default-root-dir-path.js +28 -4
- package/dist/fetch-app-branch-default-root-dir-path.js.map +1 -1
- package/dist/fetch-config.js +1 -1
- package/dist/kill-app-branch-process.d.ts.map +1 -1
- package/dist/kill-app-branch-process.js +29 -9
- package/dist/kill-app-branch-process.js.map +1 -1
- package/dist/tsconfig.src.tsbuildinfo +1 -1
- package/package.json +14 -14
|
@@ -45,7 +45,7 @@ exports.checkAppBranchesProcess = _1.__.declareManagedFunc()
|
|
|
45
45
|
const appBranchProcessExecutableFileName = _1.__.$path.basename(appBranchProcessExecutableFilePath);
|
|
46
46
|
const findProcessResultEntries = await _1.__.$findprocess.default(`name`, appBranchProcessExecutableFileName);
|
|
47
47
|
for (const findProcessResultEntry of findProcessResultEntries) {
|
|
48
|
-
if (findProcessResultEntry.ppid ===
|
|
48
|
+
if (findProcessResultEntry.ppid === appBranchProcessInfo.id
|
|
49
49
|
||
|
|
50
50
|
(findProcessResultEntry.bin !== undefined
|
|
51
51
|
&&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-apps-branches-process.js","sourceRoot":"","sources":["../src/check-apps-branches-process.ts"],"names":[],"mappings":";;;AAAA,0BAAwC;AAExC,qFAAkF;AAClF,qFAA8E;AAC9E,6FAAsF;AACtF,+EAAwE;AAIzD,+BAAuB,GAAK,KAAE,CAAC,kBAAkB,EAAE;KAC/D,IAAI,CAAC,yBAAyB,CAAC;KAC/B,SAAS,CAAC,aAAU,CAAC;KACrB,UAAU,CAAC,EAAE,CAAC;KACd,KAAK,EAAE;KACP,OAAO,CACN,KAAK,IAAI,EAAE;;IAET,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,+DAA8B,CAAC,KAAK,CAAC,EACrE,CAAC;QACC,oEAAoE;QACpE,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,+DAA8B,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC,EACpF,CAAC;YACC,oEAAoE;YACpE,MAAM,uBAAuB,GAAG,+DAA8B,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC,YAAY,CAAE,CAAC;YAE5F,IAAI,uBAAuB,CAAC,KAAK,KAAK,SAAS,EAC/C,CAAC;gBACC,SAAS;YACX,CAAC;YAED,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,KAAK,CAAC;YAE3D,IAAI,CAAC,KAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,CAAC,EAC3C,CAAC;gBACC;;mBAEG;gBAEH,IAAI,uBAAyD,CAAC;gBAE9D,IACA,CAAC;oBACC;;uBAEG;oBACH,MAAM,KAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAEpB,MAAM,sBAAsB,GAAG,MAAM,IAAA,mEAA8B,EAAC;wBAClE,KAAK;wBACL,YAAY;qBACb,CAAC,CAAC;oBAEH,MAAM,yBAAyB,GAAG,KAAE,CAAC,KAAK,CAAC,OAAO,CAChD,sBAAsB,CAAC,YAAY,CAAC,IAAI,EACxC,MAAA,sBAAsB,CAAC,wBAAwB,mCAAI,eAAe,CACnE,CAAC;oBAEF,MAAM,iBAAiB,GAAG,KAAE,CAAC,wBAAwB,CAElD;wBACD,IAAI,EAAE,KAAE,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,EAAE,MAAM,CAAC;qBAC7D,CAAC,CAAC;oBAEH,IAAI,OAAO,iBAAiB,CAAC,cAAc,KAAK,QAAQ,EACxD,CAAC;wBACC,MAAM,kCAAkC,GAAG,KAAE,CAAC,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC;wBAExI,MAAM,kCAAkC,GAAG,KAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAC;wBAEjG,MAAM,wBAAwB,GAAG,MAAM,KAAE,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAC;wBAE3G,KAAK,MAAM,sBAAsB,IAAI,wBAAwB,EAC7D,CAAC;4BACC,IACE,sBAAsB,CAAC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"check-apps-branches-process.js","sourceRoot":"","sources":["../src/check-apps-branches-process.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ exports.displaySelectAppBranchRootDirDialog = _1.__.declareManagedFunc()
|
|
|
9
9
|
.async()
|
|
10
10
|
.def(_1._.displaySelectAppBranchRootDirDialogDef)
|
|
11
11
|
.execute(async ({ selectAppBranchRootDirDialogConfig, }) => {
|
|
12
|
-
var _a
|
|
12
|
+
var _a;
|
|
13
13
|
const appInfo = await (0, retrieve_app_info_1.retrieveAppInfo)({
|
|
14
14
|
appId: selectAppBranchRootDirDialogConfig.appId,
|
|
15
15
|
appAccessToken: selectAppBranchRootDirDialogConfig.appAccessToken,
|
|
@@ -49,7 +49,7 @@ exports.displaySelectAppBranchRootDirDialog = _1.__.declareManagedFunc()
|
|
|
49
49
|
if (_1.__.$fs.readdirSync(electronDialogResultDirPath).length !== 0) {
|
|
50
50
|
return {
|
|
51
51
|
selectAppBranchRootDirDialogResult: {
|
|
52
|
-
selectedDirPath: _1.__.$path.resolve(electronDialogResultDirPath,
|
|
52
|
+
selectedDirPath: _1.__.$path.resolve(electronDialogResultDirPath, appInfo.slug),
|
|
53
53
|
},
|
|
54
54
|
};
|
|
55
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display-select-app-branch-root-dir-dialog.js","sourceRoot":"","sources":["../src/display-select-app-branch-root-dir-dialog.ts"],"names":[],"mappings":";;;AAAA,0BAA4B;AAE5B,qGAA4F;AAC5F,2DAAsD;AACtD,mDAAgD;AAEjC,2CAAmC,GAAK,KAAE,CAAC,kBAAkB,EAAE;KAC3E,KAAK,EAAE;KACP,GAAG,CAAC,IAAC,CAAC,sCAAsC,CAAC;KAC7C,OAAO,CACN,KAAK,EACH,EACE,kCAAkC,GACnC,EACD,EAAE;;IAEF,MAAM,OAAO,GAAG,MAAM,IAAA,mCAAe,EAAC;QACpC,KAAK,EAAE,kCAAkC,CAAC,KAAK;QAC/C,cAAc,EAAE,kCAAkC,CAAC,cAAc;KAClE,CAAC,CAAC;IAEH,MAAM,2BAA2B,GAAG,MAAM,IAAA,yEAAgC,EAAC;QACzE,KAAK,EAAE,kCAAkC,CAAC,KAAK;QAC/C,cAAc,EAAE,kCAAkC,CAAC,cAAc;QACjE,WAAW,EAAE,kCAAkC,CAAC,WAAW;KAC5D,CAAC,CAAC;IAEH,KAAE,CAAC,cAAc,CAAC,6BAAa,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAErD,MAAM,oBAAoB,GAAG,MAAM,KAAE,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CACnE,6BAAa,CAAC,KAAK,EACnB;QACE,UAAU,EAAE;YACV,eAAe;YACf,iBAAiB;SAClB;QACD,KAAK,EAAE,kCAAkC,CAAC,KAAK;QAC/C,OAAO,EAAE,kCAAkC,CAAC,OAAO;QACnD,WAAW,EAAE,MAAA,kCAAkC,CAAC,sBAAsB,mCAAI,2BAA2B;KACtG,CACF,CAAC;IAEF,IAAI,oBAAoB,CAAC,QAAQ,IAAI,oBAAoB,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAChF,CAAC;QACC,OAAO;YACL,kCAAkC,EAAE;gBAClC,eAAe,EAAE,SAAS;aAC3B;SACF,CAAC;IACJ,CAAC;IAED,MAAM,2BAA2B,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAEtE,KAAE,CAAC,cAAc,CAAC,2BAA2B,KAAK,SAAS,CAAC,CAAC;IAE7D,IAAI,KAAE,CAAC,GAAG,CAAC,UAAU,CAAC,2BAA2B,CAAC,EAClD,CAAC;QACC,IAAI,CAAC,KAAE,CAAC,GAAG,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC,WAAW,EAAE,EAChE,CAAC;YACC,OAAO;gBACL,kCAAkC,EAAE;oBAClC,eAAe,EAAE,SAAS;iBAC3B;aACF,CAAC;QACJ,CAAC;QAED,IAAI,KAAE,CAAC,GAAG,CAAC,WAAW,CAAC,2BAA2B,CAAC,CAAC,MAAM,KAAK,CAAC,EAChE,CAAC;YACC,OAAO;gBACL,kCAAkC,EAAE;oBAClC,eAAe,EAAE,KAAE,CAAC,KAAK,CAAC,OAAO,CAC/B,2BAA2B,EAC3B,
|
|
1
|
+
{"version":3,"file":"display-select-app-branch-root-dir-dialog.js","sourceRoot":"","sources":["../src/display-select-app-branch-root-dir-dialog.ts"],"names":[],"mappings":";;;AAAA,0BAA4B;AAE5B,qGAA4F;AAC5F,2DAAsD;AACtD,mDAAgD;AAEjC,2CAAmC,GAAK,KAAE,CAAC,kBAAkB,EAAE;KAC3E,KAAK,EAAE;KACP,GAAG,CAAC,IAAC,CAAC,sCAAsC,CAAC;KAC7C,OAAO,CACN,KAAK,EACH,EACE,kCAAkC,GACnC,EACD,EAAE;;IAEF,MAAM,OAAO,GAAG,MAAM,IAAA,mCAAe,EAAC;QACpC,KAAK,EAAE,kCAAkC,CAAC,KAAK;QAC/C,cAAc,EAAE,kCAAkC,CAAC,cAAc;KAClE,CAAC,CAAC;IAEH,MAAM,2BAA2B,GAAG,MAAM,IAAA,yEAAgC,EAAC;QACzE,KAAK,EAAE,kCAAkC,CAAC,KAAK;QAC/C,cAAc,EAAE,kCAAkC,CAAC,cAAc;QACjE,WAAW,EAAE,kCAAkC,CAAC,WAAW;KAC5D,CAAC,CAAC;IAEH,KAAE,CAAC,cAAc,CAAC,6BAAa,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAErD,MAAM,oBAAoB,GAAG,MAAM,KAAE,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CACnE,6BAAa,CAAC,KAAK,EACnB;QACE,UAAU,EAAE;YACV,eAAe;YACf,iBAAiB;SAClB;QACD,KAAK,EAAE,kCAAkC,CAAC,KAAK;QAC/C,OAAO,EAAE,kCAAkC,CAAC,OAAO;QACnD,WAAW,EAAE,MAAA,kCAAkC,CAAC,sBAAsB,mCAAI,2BAA2B;KACtG,CACF,CAAC;IAEF,IAAI,oBAAoB,CAAC,QAAQ,IAAI,oBAAoB,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAChF,CAAC;QACC,OAAO;YACL,kCAAkC,EAAE;gBAClC,eAAe,EAAE,SAAS;aAC3B;SACF,CAAC;IACJ,CAAC;IAED,MAAM,2BAA2B,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAEtE,KAAE,CAAC,cAAc,CAAC,2BAA2B,KAAK,SAAS,CAAC,CAAC;IAE7D,IAAI,KAAE,CAAC,GAAG,CAAC,UAAU,CAAC,2BAA2B,CAAC,EAClD,CAAC;QACC,IAAI,CAAC,KAAE,CAAC,GAAG,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC,WAAW,EAAE,EAChE,CAAC;YACC,OAAO;gBACL,kCAAkC,EAAE;oBAClC,eAAe,EAAE,SAAS;iBAC3B;aACF,CAAC;QACJ,CAAC;QAED,IAAI,KAAE,CAAC,GAAG,CAAC,WAAW,CAAC,2BAA2B,CAAC,CAAC,MAAM,KAAK,CAAC,EAChE,CAAC;YACC,OAAO;gBACL,kCAAkC,EAAE;oBAClC,eAAe,EAAE,KAAE,CAAC,KAAK,CAAC,OAAO,CAC/B,2BAA2B,EAC3B,OAAO,CAAC,IAAI,CACb;iBACF;aACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,kCAAkC,EAAE;YAClC,eAAe,EAAE,2BAA2B;SAC7C;KACF,CAAC;AACJ,CAAC,CACF,qCAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-app-branch-default-root-dir-path.d.ts","sourceRoot":"","sources":["../src/fetch-app-branch-default-root-dir-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,EAAE,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch-app-branch-default-root-dir-path.d.ts","sourceRoot":"","sources":["../src/fetch-app-branch-default-root-dir-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,EAAE,EAAE,MAAM,KAAK,CAAC;AAwC5B,eAAO,MAAQ,gCAAgC;;kBApCN,CAAA;;sBA6FtC,CAAC"}
|
|
@@ -7,11 +7,34 @@ const get_user_data_dir_path_1 = require("./get-user-data-dir-path");
|
|
|
7
7
|
const retrieve_app_branch_internal_info_1 = require("./retrieve-app-branch-internal-info");
|
|
8
8
|
const retrieve_app_info_1 = require("./retrieve-app-info");
|
|
9
9
|
const retrieve_config_1 = require("./retrieve-config");
|
|
10
|
+
/**
|
|
11
|
+
* Finds a non-existing path by appending suffixes (-2, -3, etc.) if needed.
|
|
12
|
+
*/
|
|
13
|
+
function findAvailablePath(basePath, appId) {
|
|
14
|
+
// If base path doesn't exist, use it
|
|
15
|
+
if (!_1.__.$fs.existsSync(basePath)) {
|
|
16
|
+
return basePath;
|
|
17
|
+
}
|
|
18
|
+
// Try suffixes -2 through -9
|
|
19
|
+
for (let i = 2; i <= 9; i++) {
|
|
20
|
+
const suffixedPath = `${basePath}-${i}`;
|
|
21
|
+
if (!_1.__.$fs.existsSync(suffixedPath)) {
|
|
22
|
+
return suffixedPath;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
// Fallback: use app ID suffix
|
|
26
|
+
const appIdFallbackPath = `${basePath}-${appId.slice(0, 6)}`;
|
|
27
|
+
if (!_1.__.$fs.existsSync(appIdFallbackPath)) {
|
|
28
|
+
return appIdFallbackPath;
|
|
29
|
+
}
|
|
30
|
+
// Ultimate fallback with full appId (guaranteed unique)
|
|
31
|
+
return `${basePath}-${appId}`;
|
|
32
|
+
}
|
|
10
33
|
exports.fetchAppBranchDefaultRootDirPath = _1.__.declareManagedFunc()
|
|
11
34
|
.async()
|
|
12
35
|
.def(_1._.fetchAppBranchDefaultRootDirPathDef)
|
|
13
36
|
.execute(async ({ appId, appAccessToken, appBranchId, }) => {
|
|
14
|
-
var _a
|
|
37
|
+
var _a;
|
|
15
38
|
const appInfo = await _1.__.invokeAsyncExp(async () => {
|
|
16
39
|
try {
|
|
17
40
|
return await (0, retrieve_app_info_1.retrieveAppInfo)({
|
|
@@ -35,13 +58,14 @@ exports.fetchAppBranchDefaultRootDirPath = _1.__.declareManagedFunc()
|
|
|
35
58
|
const appBranchDefaultRootDirConfig = appBranchId === _1._.APP_MAIN_BRANCH_ID.value
|
|
36
59
|
? config.appMainBranchDefaultRootDir
|
|
37
60
|
: config.appSecondaryBranchDefaultRootDir;
|
|
38
|
-
|
|
61
|
+
const basePath = _1.__.$path.resolve(appBranchDefaultRootDirConfig.pathTemplate
|
|
39
62
|
.split(`{rootDirPath}`).join((0, get_root_dir_path_1.getRootDirPath)())
|
|
40
63
|
.split(`{userDataDirPath}`).join((0, get_user_data_dir_path_1.getUserDataDirPath)())
|
|
41
64
|
.split(`{appId}`).join(appId)
|
|
42
|
-
.split(`{appName}`).join(
|
|
65
|
+
.split(`{appName}`).join(appInfo.slug)
|
|
43
66
|
.split(`{appBranchId}`).join(appBranchId)
|
|
44
67
|
.split(`{appBranchShortId}`).join(appBranchId.slice(0, 6))
|
|
45
|
-
.split(`{appBranchName}`).join((
|
|
68
|
+
.split(`{appBranchName}`).join((_a = appBranchInternalInfo.name) !== null && _a !== void 0 ? _a : ``));
|
|
69
|
+
return findAvailablePath(basePath, appId);
|
|
46
70
|
}).fetchAppBranchDefaultRootDirPath;
|
|
47
71
|
//# sourceMappingURL=fetch-app-branch-default-root-dir-path.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-app-branch-default-root-dir-path.js","sourceRoot":"","sources":["../src/fetch-app-branch-default-root-dir-path.ts"],"names":[],"mappings":";;;AAAA,0BAA4B;AAE5B,2DAAqD;AACrD,qEAA8D;AAC9D,2FAAoF;AACpF,2DAAsD;AACtD,uDAAmD;
|
|
1
|
+
{"version":3,"file":"fetch-app-branch-default-root-dir-path.js","sourceRoot":"","sources":["../src/fetch-app-branch-default-root-dir-path.ts"],"names":[],"mappings":"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"}
|
package/dist/fetch-config.js
CHANGED
|
@@ -45,7 +45,7 @@ exports.fetchConfig = _1.__.declareManagedFunc()
|
|
|
45
45
|
if (undefined === value)
|
|
46
46
|
return true;
|
|
47
47
|
return "object" === typeof value && null !== value && $io8(value);
|
|
48
|
-
}); const $io8 = input => "object" === typeof input.preconfiguredInfo && null !== input.preconfiguredInfo && $io9(input.preconfiguredInfo) && ("object" === typeof input.preconfiguredBranches && null !== input.preconfiguredBranches && false === Array.isArray(input.preconfiguredBranches) && $io12(input.preconfiguredBranches)) && ("object" === typeof input.preinstalledBranches && null !== input.preinstalledBranches && false === Array.isArray(input.preinstalledBranches) && $io15(input.preinstalledBranches)); const $io9 = input => "string" === typeof input.id && (undefined === input.name || "string" === typeof input.name) && (undefined === input.iconUrl || "string" === typeof input.iconUrl) && (undefined === input.bannerUrl || "string" === typeof input.bannerUrl) && (undefined === input.shortDescription || "string" === typeof input.shortDescription) && (undefined === input.longDescription || "string" === typeof input.longDescription) && "number" === typeof input.order && ("object" === typeof input.customFields && null !== input.customFields && false === Array.isArray(input.customFields) && $io10(input.customFields)); const $io10 = input => Object.keys(input).every(key => {
|
|
48
|
+
}); const $io8 = input => "object" === typeof input.preconfiguredInfo && null !== input.preconfiguredInfo && $io9(input.preconfiguredInfo) && ("object" === typeof input.preconfiguredBranches && null !== input.preconfiguredBranches && false === Array.isArray(input.preconfiguredBranches) && $io12(input.preconfiguredBranches)) && ("object" === typeof input.preinstalledBranches && null !== input.preinstalledBranches && false === Array.isArray(input.preinstalledBranches) && $io15(input.preinstalledBranches)); const $io9 = input => "string" === typeof input.id && (undefined === input.name || "string" === typeof input.name) && "string" === typeof input.slug && (undefined === input.iconUrl || "string" === typeof input.iconUrl) && (undefined === input.bannerUrl || "string" === typeof input.bannerUrl) && (undefined === input.shortDescription || "string" === typeof input.shortDescription) && (undefined === input.longDescription || "string" === typeof input.longDescription) && "number" === typeof input.order && ("object" === typeof input.customFields && null !== input.customFields && false === Array.isArray(input.customFields) && $io10(input.customFields)); const $io10 = input => Object.keys(input).every(key => {
|
|
49
49
|
const value = input[key];
|
|
50
50
|
if (undefined === value)
|
|
51
51
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kill-app-branch-process.d.ts","sourceRoot":"","sources":["../src/kill-app-branch-process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,EAAE,EAAE,MAAM,KAAK,CAAC;AAM5B,eAAO,MAAQ,oBAAoB;;;oBAF5B,CAAC;;
|
|
1
|
+
{"version":3,"file":"kill-app-branch-process.d.ts","sourceRoot":"","sources":["../src/kill-app-branch-process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,EAAE,EAAE,MAAM,KAAK,CAAC;AAM5B,eAAO,MAAQ,oBAAoB;;;oBAF5B,CAAC;;oBAkHL,CAAC"}
|
|
@@ -36,16 +36,36 @@ exports.killAppBranchProcess = _1.__.declareManagedFunc()
|
|
|
36
36
|
_1.__.$childprocess.spawnSync(`kill`, [`-9`].concat(appBranchProcessesInfo.map((x) => x.pid.toString())));
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
39
|
+
try {
|
|
40
|
+
await new Promise((resolvePromise, rejectPromise) => {
|
|
41
|
+
_1.__.$treekill(appBranchProcessInfo.id, (e) => {
|
|
42
|
+
if (e === undefined || e === null) {
|
|
43
|
+
resolvePromise();
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
rejectPromise(e);
|
|
47
|
+
}
|
|
48
|
+
});
|
|
47
49
|
});
|
|
48
|
-
}
|
|
50
|
+
}
|
|
51
|
+
catch (e) {
|
|
52
|
+
if (config.targetOperatingSystemPlatform === _1._.TargetOperatingSystemPlatform.Windows) {
|
|
53
|
+
// Fallback to wmic method if necessary
|
|
54
|
+
await new Promise((resolvePromise, rejectPromise) => {
|
|
55
|
+
_1.__.$childprocess.exec(`wmic process where processid="${String(appBranchProcessInfo.id)}" delete`, (e2) => {
|
|
56
|
+
if (e2 === undefined || e2 === null) {
|
|
57
|
+
resolvePromise();
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
rejectPromise(e2);
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
throw e;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
49
69
|
}
|
|
50
70
|
appBranchProcessInfoBox.value = undefined;
|
|
51
71
|
}).killAppBranchProcess;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kill-app-branch-process.js","sourceRoot":"","sources":["../src/kill-app-branch-process.ts"],"names":[],"mappings":";;;AAAA,0BAA4B;AAE5B,qFAAkF;AAClF,2EAAqE;AACrE,uDAAmD;AAEpC,4BAAoB,GAAK,KAAE,CAAC,kBAAkB,EAAE;KAC5D,KAAK,EAAE;KACP,GAAG,CAAC,IAAC,CAAC,uBAAuB,CAAC;KAC9B,OAAO,CACN,KAAK,EACH,EACE,KAAK,EACL,WAAW,EACX,gBAAgB,EAChB,kBAAkB,GACnB,EACD,EAAE;;IAEF,MAAM,YAAY,GAAG,IAAC,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAE1E,MAAM,uBAAuB,GAAG,KAAE,CAAC,aAAa,CAAC,GAAG,EAAE;;QAEpD,IAAI,CAAA,MAAA,+DAA8B,CAAC,KAAK,CAAC,KAAK,CAAC,0CAAG,YAAY,CAAC,MAAK,SAAS,EAC7E,CAAC;YACC,+DAA8B,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,MAAA,+DAA8B,CAAC,KAAK,CAAC,KAAK,CAAC,mCAAI,EAAE,CAAC;YAChG,+DAA8B,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,GAAG;gBAC1D,KAAK,EAAE,SAAS;aACjB,CAAC;QACJ,CAAC;QAED,OAAO,+DAA8B,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAA,MAAA,uBAAuB,CAAC,KAAK,0CAAE,EAAE,MAAK,kBAAkB,EAC5D,CAAC;QACC,MAAM,IAAI,IAAC,CAAC,4BAA4B,EAAE,CAAC;IAC7C,CAAC;IAED,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,KAAK,CAAC;IAE3D,MAAM,MAAM,GAAG,IAAA,gCAAc,GAAE,CAAC;IAEhC,IAAI,MAAM,CAAC,6BAA6B,KAAK,IAAC,CAAC,6BAA6B,CAAC,KAAK,EAClF,CAAC;QACC,MAAM,cAAc,GAAG,MAAM,IAAA,kDAAsB,EAAC;YAClD,KAAK;YACL,WAAW;SACZ,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,MAAM,KAAE,CAAC,OAAO,EAAE,CAAC;QAEzC,MAAM,sBAAsB,GAAG,aAAa,CAAC,MAAM,CACjD,CAAC,WAAW,EAAE,EAAE,WAAC,OAAA,MAAA,WAAW,CAAC,GAAG,0CAAE,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA,EAAA,CAC1E,CAAC;QAEF,KAAE,CAAC,aAAa,CAAC,SAAS,CACxB,MAAM,EACN,CAAC,IAAI,CAAC,CAAC,MAAM,CACX,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CACpD,CACF,CAAC;IACJ,CAAC;SAED,CAAC;QACC,MAAM,IAAI,OAAO,CAAO,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"kill-app-branch-process.js","sourceRoot":"","sources":["../src/kill-app-branch-process.ts"],"names":[],"mappings":"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"}
|