dequanto 0.1.43 → 0.1.45
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/lib/cjs/utils/$config.js +7 -3
- package/lib/cjs/utils/$config.js.map +1 -1
- package/lib/cjs/utils/$dependency.js +1 -1
- package/lib/cjs/utils/$dependency.js.map +1 -1
- package/lib/cjs/utils/$secret.js +15 -2
- package/lib/cjs/utils/$secret.js.map +1 -1
- package/lib/esm/utils/$config.js.map +1 -1
- package/lib/esm/utils/$config.mjs +7 -3
- package/lib/esm/utils/$dependency.js.map +1 -1
- package/lib/esm/utils/$dependency.mjs +1 -1
- package/lib/esm/utils/$secret.js.map +1 -1
- package/lib/esm/utils/$secret.mjs +15 -2
- package/lib/types/utils/$secret.d.ts +1 -0
- package/package.json +1 -1
- package/src/utils/$config.ts +7 -3
- package/src/utils/$dependency.ts +1 -1
- package/src/utils/$secret.ts +16 -3
package/lib/cjs/utils/$config.js
CHANGED
|
@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.$config = void 0;
|
|
7
|
-
const Config_1 = require("../config/Config.js");
|
|
8
|
-
const ConfigDefaults_1 = require("../config/ConfigDefaults.js");
|
|
9
7
|
const alot_1 = __importDefault(require("alot"));
|
|
10
8
|
const atma_utils_1 = require("atma-utils");
|
|
9
|
+
const Config_1 = require("../config/Config.js");
|
|
10
|
+
const ConfigDefaults_1 = require("../config/ConfigDefaults.js");
|
|
11
11
|
const _require_1 = require("./$require.js");
|
|
12
12
|
const $global = typeof global === 'undefined'
|
|
13
13
|
? window
|
|
@@ -86,7 +86,11 @@ var $config;
|
|
|
86
86
|
}
|
|
87
87
|
$config.getExplorerOptions = getExplorerOptions;
|
|
88
88
|
function set(path, value) {
|
|
89
|
-
$global.app
|
|
89
|
+
if (typeof $global.app?.config?.$set === 'function') {
|
|
90
|
+
$global.app.config.$set(path, value);
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
(0, atma_utils_1.obj_setProperty)(Config_1.config, path, value);
|
|
90
94
|
}
|
|
91
95
|
$config.set = set;
|
|
92
96
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$config.js","sourceRoot":"","sources":["../../../src/utils/$config.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAiD;AACjD,oEAAiE;AAGjE,
|
|
1
|
+
{"version":3,"file":"$config.js","sourceRoot":"","sources":["../../../src/utils/$config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$dependency.js","sourceRoot":"","sources":["../../../src/utils/$dependency.ts"],"names":[],"mappings":";AAAA,yBAAyB;;;AAEzB,+BAA4B;AAE5B,IAAiB,WAAW,CAwB3B;AAxBD,WAAiB,WAAW;IAEjB,KAAK,UAAU,IAAI,CAAW,IAAY;QAC7C,WAAW;QACX,MAAM,CAAC,GAAG,OAAO,CAAC;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,QAAQ;IAGZ,CAAC;IAPqB,gBAAI,OAOzB,CAAA;IAED,SAAgB,OAAO;QACnB,IAAI,SAAG,CAAC,OAAO,EAAE;YACb,OAAO,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"$dependency.js","sourceRoot":"","sources":["../../../src/utils/$dependency.ts"],"names":[],"mappings":";AAAA,yBAAyB;;;AAEzB,+BAA4B;AAE5B,IAAiB,WAAW,CAwB3B;AAxBD,WAAiB,WAAW;IAEjB,KAAK,UAAU,IAAI,CAAW,IAAY;QAC7C,WAAW;QACX,MAAM,CAAC,GAAG,OAAO,CAAC;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,QAAQ;IAGZ,CAAC;IAPqB,gBAAI,OAOzB,CAAA;IAED,SAAgB,OAAO;QACnB,IAAI,SAAG,CAAC,OAAO,EAAE;YACb,OAAO,QAAQ,CAAC,MAAM,CAAC;SAC1B;QACD,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE;YAClC,OAAO,SAAS,CAAC;SACpB;QACD,WAAW;QACX,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACpE,QAAQ;IAGZ,CAAC;IAZe,mBAAO,UAYtB,CAAA;AACL,CAAC,EAxBgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAwB3B"}
|
package/lib/cjs/utils/$secret.js
CHANGED
|
@@ -9,8 +9,8 @@ var $secret;
|
|
|
9
9
|
if (pin == null || pin.length === 0) {
|
|
10
10
|
return null;
|
|
11
11
|
}
|
|
12
|
-
let
|
|
13
|
-
return `${
|
|
12
|
+
let machineKey = parameters?.machineKey ?? getMachineKeyFromCli() ?? getMachineKeyFromEnv() ?? await _machine_1.$machine.id();
|
|
13
|
+
return `${machineKey}:${pin}`;
|
|
14
14
|
}
|
|
15
15
|
$secret.getPin = getPin;
|
|
16
16
|
function getPinFromCli() {
|
|
@@ -26,6 +26,19 @@ var $secret;
|
|
|
26
26
|
function getPinFromEnv() {
|
|
27
27
|
return process.env.PIN;
|
|
28
28
|
}
|
|
29
|
+
function getMachineKeyFromCli() {
|
|
30
|
+
let args = process.argv;
|
|
31
|
+
for (let i = 0; i < args.length - 1; i++) {
|
|
32
|
+
let key = args[i].replace(/^\-+/, '');
|
|
33
|
+
if (key === 'machineKey' || key === 'machine-key') {
|
|
34
|
+
return args[i + 1];
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return null;
|
|
38
|
+
}
|
|
39
|
+
function getMachineKeyFromEnv() {
|
|
40
|
+
return process.env.MACHINE_KEY;
|
|
41
|
+
}
|
|
29
42
|
})($secret = exports.$secret || (exports.$secret = {}));
|
|
30
43
|
//# sourceMappingURL=$secret.js.map
|
|
31
44
|
//# sourceMappingURL=$secret.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$secret.js","sourceRoot":"","sources":["../../../src/utils/$secret.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAEtC,IAAiB,OAAO,
|
|
1
|
+
{"version":3,"file":"$secret.js","sourceRoot":"","sources":["../../../src/utils/$secret.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAEtC,IAAiB,OAAO,CAqCvB;AArCD,WAAiB,OAAO;IACb,KAAK,UAAU,MAAM,CAAC,UAAkD;QAE3E,IAAI,GAAG,GAAG,UAAU,EAAE,GAAG,IAAI,aAAa,EAAE,IAAI,aAAa,EAAE,CAAC;QAChE,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC;SACf;QACD,IAAI,UAAU,GAAG,UAAU,EAAE,UAAU,IAAI,oBAAoB,EAAE,IAAI,oBAAoB,EAAE,IAAI,MAAM,mBAAQ,CAAC,EAAE,EAAE,CAAC;QACnH,OAAO,GAAG,UAAU,IAAI,GAAG,EAAE,CAAC;IAClC,CAAC;IARqB,cAAM,SAQ3B,CAAA;IAED,SAAS,aAAa;QAClB,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YACtC,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACtC,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,KAAK,EAAE;gBAC9B,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;aACtB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,SAAS,aAAa;QAClB,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAC3B,CAAC;IACD,SAAS,oBAAoB;QACzB,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YACtC,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACtC,IAAI,GAAG,KAAK,YAAY,IAAI,GAAG,KAAI,aAAa,EAAE;gBAC9C,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;aACtB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,SAAS,oBAAoB;QACzB,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IACnC,CAAC;AACL,CAAC,EArCgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAqCvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$config.js","sourceRoot":"","sources":["../../../src/utils/$config.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAiD;AACjD,oEAAiE;AAGjE,
|
|
1
|
+
{"version":3,"file":"$config.js","sourceRoot":"","sources":["../../../src/utils/$config.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,2CAA8D;AAC9D,oDAAiD;AACjD,oEAAiE;AAGjE,yCAAsC;AAItC,MAAM,OAAO,GAAG,OAAO,MAAM,KAAK,WAAW;IACzC,CAAC,CAAC,MAAM;IACR,CAAC,CAAC,MAAM,CAAC;AACb,IAAiB,OAAO,CA6IvB;AA7ID,WAAiB,OAAO;IAEpB,IAAI,UAAU,GAAG,IAAI,CAAC;IAEtB,SAAgB,GAAG,CAAY,IAAY,EAAE,QAAY;QACrD,IAAI,KAAK,GAAG,CAAC,OAAO,OAAO,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;eACnF,IAAA,4BAAe,EAAC,eAAM,EAAE,IAAI,CAAC;eAC7B,IAAA,4BAAe,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAEzC,IAAI,KAAK,IAAI,IAAI,IAAI,UAAU,IAAI,IAAI,EAAE;YACrC,UAAU,GAAG,SAAS,EAAE,CAAC;YACzB,OAAO,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SAC9B;QACD,IAAI,KAAK,IAAI,IAAI,EAAE;YACf,KAAK,GAAG,IAAA,4BAAe,EAAC,+BAAc,EAAE,IAAI,CAAC,CAAC;SACjD;QACD,OAAO,KAAK,IAAI,QAAQ,CAAC;IAC7B,CAAC;IAbe,WAAG,MAalB,CAAA;IAED,SAAgB,cAAc,CAAE,GAA2B;QACvD,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAsB,MAAM,CAAC,CAAC;QACpD,IAAI,MAAM,GAAG,OAAO,CAAC,GAAG,CAAwB,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC9D,IAAI,QAAuB,CAAC;QAC5B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,IAAI,KAAK,GAAG,cAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC;YACrE,IAAI,KAAK,IAAI,IAAI,EAAE;gBACf,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC;aACxB;iBAAM;gBACH,IAAI,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC;gBAChD,IAAI,KAAK,IAAG,IAAI,EAAE;oBACd,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;iBAC7B;aACJ;YACD,mBAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,gCAAgC,GAAG,EAAE,CAAC,CAAC;SACrE;aAAM;YACH,QAAQ,GAAG,GAAG,CAAC;SAClB;QACD,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC5B,eAAe;YACf,OAAO,EAAE,QAAQ,EAAS,CAAC;SAC9B;QAED,IAAI,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChC,IAAI,UAAU,IAAI,IAAI,EAAE;YACpB,sCAAsC;YACtC,IAAI,KAAK,GAAG,cAAI;iBACX,UAAU,CAAC,IAAI,CAAC;iBAChB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;iBAC3C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;YACnD,UAAU,GAAG,KAAK,EAAE,KAAK,CAAC;SAC7B;QAED,IAAI,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE7F,mBAAQ,CAAC,OAAO,CAAC,UAAU,IAAI,WAAW,EAAE,wBAAwB,QAAQ,kBAAkB,CAAC,CAAC;QAChG,OAAO;YACH,QAAQ;YACR,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC;YACtB,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;SACK,CAAC;IACnC,CAAC;IAzCe,sBAAc,iBAyC7B,CAAA;IAED,SAAgB,kBAAkB,CAAE,GAA2B;QAC3D,IAAI,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;QAE5C,IAAI,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAoC,oBAAoB,CAAC,CAAC;QACpF,IAAI,MAAM,GAAG,OAAO,CAAC,GAAG,CAAwB,QAAQ,EAAE,EAAE,CAAC,CAAC;QAG9D,IAAI,cAAc,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE7F,mBAAQ,CAAC,OAAO,CAAC,cAAc,IAAI,WAAW,EAAE,wBAAwB,QAAQ,kBAAkB,CAAC,CAAC;QACpG,OAAO;YACH,QAAQ;YACR,GAAG,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACtC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;SACE,CAAC;IACpC,CAAC;IAhBe,0BAAkB,qBAgBjC,CAAA;IAED,SAAgB,GAAG,CAAY,IAAY,EAAE,KAAQ;QACjD,IAAI,OAAO,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,KAAK,UAAU,EAAE;YACjD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACrC,OAAO;SACV;QACD,IAAA,4BAAe,EAAC,eAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;IANe,WAAG,MAMlB,CAAA;IAED;;OAEG;IACH,SAAgB,SAAS,CAAC,IAAe,EAAE,GAA+B;QAEtE,IAAI,IAAI,IAAI,IAAI,IAAI,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,CAAC,IAAI,EAAE;YAChE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;SACvB;QACD,IAAI,GAAG,IAAI,IAAI,IAAI,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE;YAC9D,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;SACrB;QAED,UAAU,GAAG,EAAE,CAAC;QAChB,IAAI,IAAI,IAAI,IAAI,EAAE;YACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAClC,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBACxB,IAAI,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;oBAC7B,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;oBACrC,GAAG,GAAG,UAAU,CAAC;iBACpB;gBACD,IAAI,GAAG,KAAK,UAAU,EAAE;oBACpB,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;oBAC1B,IAAI,KAAK,KAAK,EAAE,EAAE;wBACd,SAAS;qBACZ;oBACD,IAAI,CAAE,IAAI,EAAE,GAAG,CAAE,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAErC,IAAA,4BAAe,EAAC,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;oBACrD,CAAC,EAAE,CAAC;iBACP;aACJ;SACJ;QACD,IAAI,GAAG,IAAI,IAAI,EAAE;YACb,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE;gBACjB,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;oBAC5B,SAAS;iBACZ;gBACD,IAAI,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACtE,IAAI,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;gBACnB,IAAA,4BAAe,EAAC,UAAU,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;aAC1C;SACJ;QACD,OAAO,UAAU,CAAC;IACtB,CAAC;IAzCe,iBAAS,YAyCxB,CAAA;IACD,SAAS,UAAU,CAAC,KAAa;QAC7B,KAAK,GAAG,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,CAAC,EAAE;YACH,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SAC/C;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC,EA7IgB,OAAO,GAAP,eAAO,KAAP,eAAO,QA6IvB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { config } from '../config/Config.mjs';
|
|
2
|
-
import { ConfigDefaults } from '../config/ConfigDefaults.mjs';
|
|
3
1
|
import alot from 'alot';
|
|
4
2
|
import { obj_getProperty, obj_setProperty } from 'atma-utils';
|
|
3
|
+
import { config } from '../config/Config.mjs';
|
|
4
|
+
import { ConfigDefaults } from '../config/ConfigDefaults.mjs';
|
|
5
5
|
import { $require } from './$require.mjs';
|
|
6
6
|
const $global = typeof global === 'undefined'
|
|
7
7
|
? window
|
|
@@ -80,7 +80,11 @@ export var $config;
|
|
|
80
80
|
}
|
|
81
81
|
$config.getExplorerOptions = getExplorerOptions;
|
|
82
82
|
function set(path, value) {
|
|
83
|
-
$global.app
|
|
83
|
+
if (typeof $global.app?.config?.$set === 'function') {
|
|
84
|
+
$global.app.config.$set(path, value);
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
obj_setProperty(config, path, value);
|
|
84
88
|
}
|
|
85
89
|
$config.set = set;
|
|
86
90
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$dependency.js","sourceRoot":"","sources":["../../../src/utils/$dependency.ts"],"names":[],"mappings":";AAAA,yBAAyB;;;AAEzB,+BAA4B;AAE5B,IAAiB,WAAW,CAwB3B;AAxBD,WAAiB,WAAW;IAEjB,KAAK,UAAU,IAAI,CAAW,IAAY;QAC7C,WAAW;QACX,MAAM,CAAC,GAAG,OAAO,CAAC;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,QAAQ;IAGZ,CAAC;IAPqB,gBAAI,OAOzB,CAAA;IAED,SAAgB,OAAO;QACnB,IAAI,SAAG,CAAC,OAAO,EAAE;YACb,OAAO,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"$dependency.js","sourceRoot":"","sources":["../../../src/utils/$dependency.ts"],"names":[],"mappings":";AAAA,yBAAyB;;;AAEzB,+BAA4B;AAE5B,IAAiB,WAAW,CAwB3B;AAxBD,WAAiB,WAAW;IAEjB,KAAK,UAAU,IAAI,CAAW,IAAY;QAC7C,WAAW;QACX,MAAM,CAAC,GAAG,OAAO,CAAC;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,QAAQ;IAGZ,CAAC;IAPqB,gBAAI,OAOzB,CAAA;IAED,SAAgB,OAAO;QACnB,IAAI,SAAG,CAAC,OAAO,EAAE;YACb,OAAO,QAAQ,CAAC,MAAM,CAAC;SAC1B;QACD,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE;YAClC,OAAO,SAAS,CAAC;SACpB;QACD,WAAW;QACX,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACpE,QAAQ;IAGZ,CAAC;IAZe,mBAAO,UAYtB,CAAA;AACL,CAAC,EAxBgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAwB3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$secret.js","sourceRoot":"","sources":["../../../src/utils/$secret.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAEtC,IAAiB,OAAO,
|
|
1
|
+
{"version":3,"file":"$secret.js","sourceRoot":"","sources":["../../../src/utils/$secret.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAEtC,IAAiB,OAAO,CAqCvB;AArCD,WAAiB,OAAO;IACb,KAAK,UAAU,MAAM,CAAC,UAAkD;QAE3E,IAAI,GAAG,GAAG,UAAU,EAAE,GAAG,IAAI,aAAa,EAAE,IAAI,aAAa,EAAE,CAAC;QAChE,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC;SACf;QACD,IAAI,UAAU,GAAG,UAAU,EAAE,UAAU,IAAI,oBAAoB,EAAE,IAAI,oBAAoB,EAAE,IAAI,MAAM,mBAAQ,CAAC,EAAE,EAAE,CAAC;QACnH,OAAO,GAAG,UAAU,IAAI,GAAG,EAAE,CAAC;IAClC,CAAC;IARqB,cAAM,SAQ3B,CAAA;IAED,SAAS,aAAa;QAClB,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YACtC,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACtC,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,KAAK,EAAE;gBAC9B,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;aACtB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,SAAS,aAAa;QAClB,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAC3B,CAAC;IACD,SAAS,oBAAoB;QACzB,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YACtC,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACtC,IAAI,GAAG,KAAK,YAAY,IAAI,GAAG,KAAI,aAAa,EAAE;gBAC9C,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;aACtB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,SAAS,oBAAoB;QACzB,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IACnC,CAAC;AACL,CAAC,EArCgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAqCvB"}
|
|
@@ -6,8 +6,8 @@ export var $secret;
|
|
|
6
6
|
if (pin == null || pin.length === 0) {
|
|
7
7
|
return null;
|
|
8
8
|
}
|
|
9
|
-
let
|
|
10
|
-
return `${
|
|
9
|
+
let machineKey = parameters?.machineKey ?? getMachineKeyFromCli() ?? getMachineKeyFromEnv() ?? await $machine.id();
|
|
10
|
+
return `${machineKey}:${pin}`;
|
|
11
11
|
}
|
|
12
12
|
$secret.getPin = getPin;
|
|
13
13
|
function getPinFromCli() {
|
|
@@ -23,6 +23,19 @@ export var $secret;
|
|
|
23
23
|
function getPinFromEnv() {
|
|
24
24
|
return process.env.PIN;
|
|
25
25
|
}
|
|
26
|
+
function getMachineKeyFromCli() {
|
|
27
|
+
let args = process.argv;
|
|
28
|
+
for (let i = 0; i < args.length - 1; i++) {
|
|
29
|
+
let key = args[i].replace(/^\-+/, '');
|
|
30
|
+
if (key === 'machineKey' || key === 'machine-key') {
|
|
31
|
+
return args[i + 1];
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
36
|
+
function getMachineKeyFromEnv() {
|
|
37
|
+
return process.env.MACHINE_KEY;
|
|
38
|
+
}
|
|
26
39
|
})($secret || ($secret = {}));
|
|
27
40
|
//# sourceMappingURL=$secret.js.map
|
|
28
41
|
//# sourceMappingURL=$secret.ts.map
|
package/package.json
CHANGED
package/src/utils/$config.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import alot from 'alot';
|
|
2
|
+
import { obj_getProperty, obj_setProperty } from 'atma-utils';
|
|
1
3
|
import { config } from '@dequanto/config/Config';
|
|
2
4
|
import { ConfigDefaults } from '@dequanto/config/ConfigDefaults';
|
|
3
5
|
import { IConfigData } from '@dequanto/config/interface/IConfigData';
|
|
4
6
|
import { TEth } from '@dequanto/models/TEth';
|
|
5
|
-
import alot from 'alot';
|
|
6
|
-
import { obj_getProperty, obj_setProperty } from 'atma-utils';
|
|
7
7
|
import { $require } from './$require';
|
|
8
8
|
import { IWeb3ClientOptions } from '@dequanto/clients/interfaces/IWeb3Client';
|
|
9
9
|
import { TExplorerDefinition } from '@dequanto/models/TExplorer';
|
|
@@ -92,7 +92,11 @@ export namespace $config {
|
|
|
92
92
|
}
|
|
93
93
|
|
|
94
94
|
export function set <T = any> (path: string, value: T) {
|
|
95
|
-
$global.app
|
|
95
|
+
if (typeof $global.app?.config?.$set === 'function') {
|
|
96
|
+
$global.app.config.$set(path, value);
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
obj_setProperty(config, path, value);
|
|
96
100
|
}
|
|
97
101
|
|
|
98
102
|
/**
|
package/src/utils/$dependency.ts
CHANGED
package/src/utils/$secret.ts
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { $machine } from './$machine';
|
|
2
2
|
|
|
3
3
|
export namespace $secret {
|
|
4
|
-
export async function getPin(parameters?: { pin?: string }) {
|
|
4
|
+
export async function getPin(parameters?: { pin?: string, machineKey?: string }) {
|
|
5
5
|
|
|
6
6
|
let pin = parameters?.pin ?? getPinFromCli() ?? getPinFromEnv();
|
|
7
7
|
if (pin == null || pin.length === 0) {
|
|
8
8
|
return null;
|
|
9
9
|
}
|
|
10
|
-
let
|
|
11
|
-
return `${
|
|
10
|
+
let machineKey = parameters?.machineKey ?? getMachineKeyFromCli() ?? getMachineKeyFromEnv() ?? await $machine.id();
|
|
11
|
+
return `${machineKey}:${pin}`;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
function getPinFromCli () {
|
|
@@ -24,4 +24,17 @@ export namespace $secret {
|
|
|
24
24
|
function getPinFromEnv () {
|
|
25
25
|
return process.env.PIN;
|
|
26
26
|
}
|
|
27
|
+
function getMachineKeyFromCli () {
|
|
28
|
+
let args = process.argv;
|
|
29
|
+
for (let i = 0; i < args.length - 1; i++) {
|
|
30
|
+
let key = args[i].replace(/^\-+/, '');
|
|
31
|
+
if (key === 'machineKey' || key ==='machine-key') {
|
|
32
|
+
return args[i + 1];
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
function getMachineKeyFromEnv () {
|
|
38
|
+
return process.env.MACHINE_KEY;
|
|
39
|
+
}
|
|
27
40
|
}
|