@boristype/ws-client 0.1.0-alpha.1 → 0.1.0-alpha.3
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/LICENSE +21 -21
- package/README.md +59 -0
- package/build/client.d.ts +3 -2
- package/build/client.d.ts.map +1 -0
- package/build/client.js +29 -26
- package/build/client.js.map +1 -0
- package/build/evaluator.d.ts +3 -2
- package/build/evaluator.d.ts.map +1 -0
- package/build/evaluator.js +22 -21
- package/build/evaluator.js.map +1 -0
- package/build/exceptions.d.ts +1 -0
- package/build/exceptions.d.ts.map +1 -0
- package/build/exceptions.js +4 -3
- package/build/exceptions.js.map +1 -0
- package/build/index.d.ts +8 -7
- package/build/index.d.ts.map +1 -0
- package/build/index.js +6 -5
- package/build/index.js.map +1 -0
- package/build/soap-utils.d.ts +1 -0
- package/build/soap-utils.d.ts.map +1 -0
- package/build/soap-utils.js +77 -54
- package/build/soap-utils.js.map +1 -0
- package/build/types.d.ts +1 -0
- package/build/types.d.ts.map +1 -0
- package/build/types.js +1 -0
- package/build/types.js.map +1 -0
- package/build/uploader.d.ts +2 -1
- package/build/uploader.d.ts.map +1 -0
- package/build/uploader.js +35 -36
- package/build/uploader.js.map +1 -0
- package/package.json +7 -6
- package/resources/upload_finish.bs +267 -267
- package/resources/upload_prepare.bs +11 -11
package/LICENSE
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
MIT License
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2025 BorisType
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
-
in the Software without restriction, including without limitation the rights
|
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
-
furnished to do so, subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in all
|
|
13
|
-
copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2025 BorisType
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
ADDED
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
# @boristype/ws-client
|
|
2
|
+
|
|
3
|
+
Node.js SOAP-клиент для WebSoft HCM. Используется CLI и MCP BorisType;
|
|
4
|
+
не требует установки компилятора или DLL. Node.js 24 или новее.
|
|
5
|
+
|
|
6
|
+
```sh
|
|
7
|
+
npm install @boristype/ws-client@next
|
|
8
|
+
```
|
|
9
|
+
|
|
10
|
+
Публичные exports:
|
|
11
|
+
|
|
12
|
+
| Export | Назначение |
|
|
13
|
+
| ------------------------------------- | ------------------------------------------------------------------ |
|
|
14
|
+
| `WshcmClient` | Подключение и `callMethod(object, method, args)` через SP-XML SOAP |
|
|
15
|
+
| `Evaluator` | Временный серверный модуль для выполнения BorisScript |
|
|
16
|
+
| `WshcmUploader` | Пакетная загрузка файлов через серверные BS resources |
|
|
17
|
+
| `WshcmException`, `UnauthorizedError` | Ошибки SOAP/аутентификации |
|
|
18
|
+
| `renderRequest`, `parseResponse` | Низкоуровневая сериализация SOAP |
|
|
19
|
+
|
|
20
|
+
Типы опций экспортируются вместе с JavaScript declarations. Минимальный пример
|
|
21
|
+
для доверенного тестового стенда, с реквизитами из environment:
|
|
22
|
+
|
|
23
|
+
```js
|
|
24
|
+
import { WshcmClient } from "@boristype/ws-client";
|
|
25
|
+
|
|
26
|
+
const client = new WshcmClient({
|
|
27
|
+
overHttps: true,
|
|
28
|
+
host: process.env.WSHCM_HOST,
|
|
29
|
+
port: 443,
|
|
30
|
+
username: process.env.WSHCM_USERNAME,
|
|
31
|
+
password: process.env.WSHCM_PASSWORD,
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
await client.initialize();
|
|
35
|
+
const evaluator = client.createEvaluator();
|
|
36
|
+
try {
|
|
37
|
+
await evaluator.initialize();
|
|
38
|
+
console.log(await evaluator.eval("return 2 + 2;"));
|
|
39
|
+
} finally {
|
|
40
|
+
await evaluator.close();
|
|
41
|
+
}
|
|
42
|
+
```
|
|
43
|
+
|
|
44
|
+
Перед запуском задать `WSHCM_HOST`, `WSHCM_USERNAME`, `WSHCM_PASSWORD`.
|
|
45
|
+
У учётной записи должны быть права на соответствующие серверные методы.
|
|
46
|
+
Evaluator создаёт временный `.bs` файл на сервере и исполняет переданный код;
|
|
47
|
+
использовать только доверенный код и закрывать evaluator после работы.
|
|
48
|
+
`close()` возвращает false, если очистка не удалась.
|
|
49
|
+
|
|
50
|
+
Клиент сохраняет строковые SOAP значения, включая whitespace, CR/LF и текст,
|
|
51
|
+
похожий на числа; явный `VALUE-TYPE` по-прежнему влияет на преобразование.
|
|
52
|
+
Ограничения чисел/SQL/XML целевой платформы этим не устраняются. HTTP timeout
|
|
53
|
+
не отменяет выполняемый серверный код и не гарантирует rollback: операции
|
|
54
|
+
с изменениями нельзя автоматически повторять после неизвестного результата.
|
|
55
|
+
|
|
56
|
+
Пакет содержит JavaScript, declarations и два BS resources для uploader.
|
|
57
|
+
Исходники, тесты, конфигурация стенда и DLL в npm-архив не входят.
|
|
58
|
+
Подробнее: [документация BorisType](https://github.com/BorisType/BorisType/tree/main/docs)
|
|
59
|
+
и [сценарии MCP](https://github.com/BorisType/BorisType/blob/main/docs/guides/mcp-server.md).
|
package/build/client.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { WshcmClientOptions } from
|
|
2
|
-
import { Evaluator } from
|
|
1
|
+
import { WshcmClientOptions } from "./types.js";
|
|
2
|
+
import { Evaluator } from "./evaluator.js";
|
|
3
3
|
/**
|
|
4
4
|
* Клиент для работы с WebSoft HCM через SP-XML API
|
|
5
5
|
*
|
|
@@ -67,3 +67,4 @@ export declare class WshcmClient {
|
|
|
67
67
|
*/
|
|
68
68
|
private makeRequest;
|
|
69
69
|
}
|
|
70
|
+
//# sourceMappingURL=client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAS3C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,cAAc,CAAS;IAE/B;;;OAGG;gBACS,OAAO,EAAE,kBAAkB;IAQvC;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC;;;;;;;OAOG;IACG,UAAU,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAgB1F;;;;;;;OAOG;IACH,eAAe,IAAI,SAAS;IAI5B;;;;;;;OAOG;IACH,OAAO,CAAC,WAAW;CAmEpB"}
|
package/build/client.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import * as https from
|
|
2
|
-
import * as http from
|
|
3
|
-
import { UnauthorizedError, WshcmException } from
|
|
4
|
-
import { renderRequest, parseResponse } from
|
|
5
|
-
import { Evaluator } from
|
|
1
|
+
import * as https from "https";
|
|
2
|
+
import * as http from "http";
|
|
3
|
+
import { UnauthorizedError, WshcmException } from "./exceptions.js";
|
|
4
|
+
import { renderRequest, parseResponse } from "./soap-utils.js";
|
|
5
|
+
import { Evaluator } from "./evaluator.js";
|
|
6
6
|
// ============================================================================
|
|
7
7
|
// Main WSHCM Client
|
|
8
8
|
// ============================================================================
|
|
@@ -43,7 +43,7 @@ export class WshcmClient {
|
|
|
43
43
|
*/
|
|
44
44
|
constructor(options) {
|
|
45
45
|
this.isHttps = options.overHttps;
|
|
46
|
-
this.baseUrl = `${options.overHttps ?
|
|
46
|
+
this.baseUrl = `${options.overHttps ? "https" : "http"}://${options.host}:${options.port}`;
|
|
47
47
|
this.username = options.username;
|
|
48
48
|
this.password = options.password;
|
|
49
49
|
this.requestTimeout = options.requestTimeout ?? DEFAULT_REQUEST_TIMEOUT;
|
|
@@ -53,7 +53,7 @@ export class WshcmClient {
|
|
|
53
53
|
* Должен быть вызван после создания экземпляра
|
|
54
54
|
*/
|
|
55
55
|
async initialize() {
|
|
56
|
-
const statusCode = await this.makeRequest(
|
|
56
|
+
const statusCode = await this.makeRequest("/spxml_web/main.htm", "GET");
|
|
57
57
|
if (statusCode !== 200) {
|
|
58
58
|
throw new UnauthorizedError();
|
|
59
59
|
}
|
|
@@ -68,15 +68,15 @@ export class WshcmClient {
|
|
|
68
68
|
*/
|
|
69
69
|
async callMethod(lib, method, methodArgs = []) {
|
|
70
70
|
const headers = {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
71
|
+
accept: "*/*",
|
|
72
|
+
"accept-language": "ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7",
|
|
73
|
+
"cache-control": "no-cache",
|
|
74
|
+
"content-type": "application/soap+xml; charset=UTF-8",
|
|
75
|
+
pragma: "no-cache",
|
|
76
|
+
"x-spxml-client": "SP-XML Web client 1.0",
|
|
77
77
|
};
|
|
78
78
|
const body = renderRequest(lib, method, methodArgs);
|
|
79
|
-
const responseText = await this.makeRequest(
|
|
79
|
+
const responseText = await this.makeRequest("/api/spxml/CallMethod", "POST", headers, body);
|
|
80
80
|
return parseResponse(responseText);
|
|
81
81
|
}
|
|
82
82
|
/**
|
|
@@ -101,16 +101,16 @@ export class WshcmClient {
|
|
|
101
101
|
makeRequest(path, method, headers = {}, body) {
|
|
102
102
|
return new Promise((resolve, reject) => {
|
|
103
103
|
const url = new URL(this.baseUrl + path);
|
|
104
|
-
const auth = Buffer.from(`${this.username}:${this.password}`).toString(
|
|
104
|
+
const auth = Buffer.from(`${this.username}:${this.password}`).toString("base64");
|
|
105
105
|
const allHeaders = {
|
|
106
106
|
...headers,
|
|
107
|
-
|
|
107
|
+
Authorization: `Basic ${auth}`,
|
|
108
108
|
};
|
|
109
109
|
if (this.cookies.length > 0) {
|
|
110
|
-
allHeaders[
|
|
110
|
+
allHeaders["Cookie"] = this.cookies.join("; ");
|
|
111
111
|
}
|
|
112
112
|
if (body) {
|
|
113
|
-
allHeaders[
|
|
113
|
+
allHeaders["Content-Length"] = Buffer.byteLength(body).toString();
|
|
114
114
|
}
|
|
115
115
|
const options = {
|
|
116
116
|
hostname: url.hostname,
|
|
@@ -123,16 +123,18 @@ export class WshcmClient {
|
|
|
123
123
|
const lib = this.isHttps ? https : http;
|
|
124
124
|
const req = lib.request(options, (res) => {
|
|
125
125
|
// Сохраняем cookies
|
|
126
|
-
const setCookie = res.headers[
|
|
126
|
+
const setCookie = res.headers["set-cookie"];
|
|
127
127
|
if (setCookie) {
|
|
128
|
-
this.cookies.push(...setCookie.map(cookie => cookie.split(
|
|
128
|
+
this.cookies.push(...setCookie.map((cookie) => cookie.split(";")[0]));
|
|
129
129
|
}
|
|
130
|
-
|
|
131
|
-
res.
|
|
130
|
+
// Keep incomplete UTF-8 sequences between HTTP chunks instead of decoding each Buffer separately.
|
|
131
|
+
res.setEncoding("utf8");
|
|
132
|
+
let data = "";
|
|
133
|
+
res.on("data", (chunk) => {
|
|
132
134
|
data += chunk;
|
|
133
135
|
});
|
|
134
|
-
res.on(
|
|
135
|
-
if (method ===
|
|
136
|
+
res.on("end", () => {
|
|
137
|
+
if (method === "GET") {
|
|
136
138
|
resolve(res.statusCode || 500);
|
|
137
139
|
}
|
|
138
140
|
else {
|
|
@@ -140,11 +142,11 @@ export class WshcmClient {
|
|
|
140
142
|
}
|
|
141
143
|
});
|
|
142
144
|
});
|
|
143
|
-
req.on(
|
|
145
|
+
req.on("timeout", () => {
|
|
144
146
|
req.destroy();
|
|
145
147
|
reject(new WshcmException(`Request timed out after ${this.requestTimeout}ms: ${method} ${path}`));
|
|
146
148
|
});
|
|
147
|
-
req.on(
|
|
149
|
+
req.on("error", (error) => {
|
|
148
150
|
reject(new WshcmException(`Request failed: ${error.message}`));
|
|
149
151
|
});
|
|
150
152
|
if (body) {
|
|
@@ -154,3 +156,4 @@ export class WshcmClient {
|
|
|
154
156
|
});
|
|
155
157
|
}
|
|
156
158
|
}
|
|
159
|
+
//# sourceMappingURL=client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/build/evaluator.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { WshcmClient } from
|
|
1
|
+
import { WshcmClient } from "./client.js";
|
|
2
2
|
/**
|
|
3
3
|
* Evaluator для выполнения произвольного BorisScript-кода на сервере
|
|
4
4
|
*
|
|
@@ -7,7 +7,7 @@ import { WshcmClient } from './client.js';
|
|
|
7
7
|
*
|
|
8
8
|
* @example
|
|
9
9
|
* ```typescript
|
|
10
|
-
* const evaluator = client.
|
|
10
|
+
* const evaluator = client.createEvaluator();
|
|
11
11
|
* await evaluator.initialize();
|
|
12
12
|
* const result = await evaluator.eval('return 2 + 2;');
|
|
13
13
|
* await evaluator.close();
|
|
@@ -49,3 +49,4 @@ export declare class Evaluator {
|
|
|
49
49
|
*/
|
|
50
50
|
private getUnsafeEvalScript;
|
|
51
51
|
}
|
|
52
|
+
//# sourceMappingURL=evaluator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"evaluator.d.ts","sourceRoot":"","sources":["../src/evaluator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;;;;;;GAaG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,WAAW,CAAS;IAE5B;;;OAGG;gBACS,MAAM,EAAE,WAAW;IAM/B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUjC;;;;OAIG;IACG,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAOhC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAOpC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAI1C;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAa/B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;OAEG;IACH,OAAO,CAAC,mBAAmB;CAgB5B"}
|
package/build/evaluator.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*
|
|
7
7
|
* @example
|
|
8
8
|
* ```typescript
|
|
9
|
-
* const evaluator = client.
|
|
9
|
+
* const evaluator = client.createEvaluator();
|
|
10
10
|
* await evaluator.initialize();
|
|
11
11
|
* const result = await evaluator.eval('return 2 + 2;');
|
|
12
12
|
* await evaluator.close();
|
|
@@ -23,7 +23,7 @@ export class Evaluator {
|
|
|
23
23
|
*/
|
|
24
24
|
constructor(client) {
|
|
25
25
|
this.client = client;
|
|
26
|
-
this.evalKey =
|
|
26
|
+
this.evalKey = "unsafe_eval_" + this.generateRandomString(32);
|
|
27
27
|
this.libUrl = `x-local://wt/${this.evalKey}.bs`;
|
|
28
28
|
}
|
|
29
29
|
/**
|
|
@@ -34,7 +34,7 @@ export class Evaluator {
|
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
36
|
const content = this.getUnsafeEvalScript();
|
|
37
|
-
await this.client.callMethod(
|
|
37
|
+
await this.client.callMethod("tools", "put_url_text_server", [this.libUrl, content]);
|
|
38
38
|
this.initialized = true;
|
|
39
39
|
}
|
|
40
40
|
/**
|
|
@@ -46,11 +46,11 @@ export class Evaluator {
|
|
|
46
46
|
if (!this.initialized) {
|
|
47
47
|
await this.initialize();
|
|
48
48
|
}
|
|
49
|
-
return this.client.callMethod(this.libUrl,
|
|
49
|
+
return this.client.callMethod(this.libUrl, "execute", [code]);
|
|
50
50
|
}
|
|
51
51
|
async evalCode(code) {
|
|
52
52
|
// Оборачиваем код в функцию, чтобы явно не возвращать никакого результата всего сегмента кода, даже если в коде есть return
|
|
53
|
-
const randomFuncName =
|
|
53
|
+
const randomFuncName = "__evaluator_wrapper_" + this.generateRandomString(32);
|
|
54
54
|
const wrappedCode = `function ${randomFuncName}() {\n${code}\n}\n${randomFuncName}();return;`;
|
|
55
55
|
return this.eval(wrappedCode);
|
|
56
56
|
}
|
|
@@ -66,7 +66,7 @@ export class Evaluator {
|
|
|
66
66
|
return false;
|
|
67
67
|
}
|
|
68
68
|
try {
|
|
69
|
-
const result = await this.client.callMethod(this.libUrl,
|
|
69
|
+
const result = await this.client.callMethod(this.libUrl, "drop_self", []);
|
|
70
70
|
this.initialized = false;
|
|
71
71
|
return result;
|
|
72
72
|
}
|
|
@@ -78,8 +78,8 @@ export class Evaluator {
|
|
|
78
78
|
* Генерирует случайную строку заданной длины
|
|
79
79
|
*/
|
|
80
80
|
generateRandomString(length) {
|
|
81
|
-
const chars =
|
|
82
|
-
let result =
|
|
81
|
+
const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
|
82
|
+
let result = "";
|
|
83
83
|
for (let i = 0; i < length; i++) {
|
|
84
84
|
result += chars.charAt(Math.floor(Math.random() * chars.length));
|
|
85
85
|
}
|
|
@@ -89,19 +89,20 @@ export class Evaluator {
|
|
|
89
89
|
* Возвращает содержимое временного модуля unsafe_eval.bs
|
|
90
90
|
*/
|
|
91
91
|
getUnsafeEvalScript() {
|
|
92
|
-
return `"META:ALLOW-CALL-FROM-CLIENT:1"
|
|
93
|
-
function execute(code) {
|
|
94
|
-
return eval(code);
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
"META:ALLOW-CALL-FROM-CLIENT:1"
|
|
98
|
-
function drop_self() {
|
|
99
|
-
try {
|
|
100
|
-
DeleteFile("${this.libUrl}");
|
|
101
|
-
return true;
|
|
102
|
-
} catch (err) {
|
|
103
|
-
return false;
|
|
104
|
-
}
|
|
92
|
+
return `"META:ALLOW-CALL-FROM-CLIENT:1"
|
|
93
|
+
function execute(code) {
|
|
94
|
+
return eval(code);
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
"META:ALLOW-CALL-FROM-CLIENT:1"
|
|
98
|
+
function drop_self() {
|
|
99
|
+
try {
|
|
100
|
+
DeleteFile("${this.libUrl}");
|
|
101
|
+
return true;
|
|
102
|
+
} catch (err) {
|
|
103
|
+
return false;
|
|
104
|
+
}
|
|
105
105
|
}`;
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
|
+
//# sourceMappingURL=evaluator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"evaluator.js","sourceRoot":"","sources":["../src/evaluator.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,SAAS;IACZ,MAAM,CAAc;IACpB,OAAO,CAAS;IAChB,MAAM,CAAS;IACf,WAAW,GAAG,KAAK,CAAC;IAE5B;;;OAGG;IACH,YAAY,MAAmB;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,GAAG,gBAAgB,IAAI,CAAC,OAAO,KAAK,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3C,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,qBAAqB,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACrF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,IAAI,CAAC,IAAY;QACrB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAY;QACzB,4HAA4H;QAC5H,MAAM,cAAc,GAAG,sBAAsB,GAAG,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAC9E,MAAM,WAAW,GAAG,YAAY,cAAc,SAAS,IAAI,QAAQ,cAAc,YAAY,CAAC;QAC9F,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;YAC1E,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;YACzB,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;OAEG;IACK,oBAAoB,CAAC,MAAc;QACzC,MAAM,KAAK,GAAG,gEAAgE,CAAC;QAC/E,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACK,mBAAmB;QACzB,OAAO;;;;;;;;sBAQW,IAAI,CAAC,MAAM;;;;;EAK/B,CAAC;IACD,CAAC;CACF"}
|
package/build/exceptions.d.ts
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exceptions.d.ts","sourceRoot":"","sources":["../src/exceptions.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,qBAAa,cAAe,SAAQ,KAAK;gBAC3B,OAAO,EAAE,MAAM;CAK5B;AAED;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,cAAc;gBACvC,OAAO,GAAE,MAAuB;CAK7C"}
|
package/build/exceptions.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
export class WshcmException extends Error {
|
|
5
5
|
constructor(message) {
|
|
6
6
|
super(message);
|
|
7
|
-
this.name =
|
|
7
|
+
this.name = "WshcmException";
|
|
8
8
|
Object.setPrototypeOf(this, WshcmException.prototype);
|
|
9
9
|
}
|
|
10
10
|
}
|
|
@@ -12,9 +12,10 @@ export class WshcmException extends Error {
|
|
|
12
12
|
* Исключение при ошибке авторизации
|
|
13
13
|
*/
|
|
14
14
|
export class UnauthorizedError extends WshcmException {
|
|
15
|
-
constructor(message =
|
|
15
|
+
constructor(message = "Unauthorized") {
|
|
16
16
|
super(message);
|
|
17
|
-
this.name =
|
|
17
|
+
this.name = "UnauthorizedError";
|
|
18
18
|
Object.setPrototypeOf(this, UnauthorizedError.prototype);
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
+
//# sourceMappingURL=exceptions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exceptions.js","sourceRoot":"","sources":["../src/exceptions.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,OAAO,cAAe,SAAQ,KAAK;IACvC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;QAC7B,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,cAAc;IACnD,YAAY,UAAkB,cAAc;QAC1C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC;CACF"}
|
package/build/index.d.ts
CHANGED
|
@@ -3,10 +3,11 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @module wshcm
|
|
5
5
|
*/
|
|
6
|
-
export { WshcmClient } from
|
|
7
|
-
export { Evaluator } from
|
|
8
|
-
export { WshcmException, UnauthorizedError } from
|
|
9
|
-
export { renderRequest, parseResponse } from
|
|
10
|
-
export { WshcmUploader } from
|
|
11
|
-
export type { WshcmClientOptions } from
|
|
12
|
-
export type { WshcmUploaderOptions, UploadProgressCallback } from
|
|
6
|
+
export { WshcmClient } from "./client.js";
|
|
7
|
+
export { Evaluator } from "./evaluator.js";
|
|
8
|
+
export { WshcmException, UnauthorizedError } from "./exceptions.js";
|
|
9
|
+
export { renderRequest, parseResponse } from "./soap-utils.js";
|
|
10
|
+
export { WshcmUploader } from "./uploader.js";
|
|
11
|
+
export type { WshcmClientOptions } from "./types.js";
|
|
12
|
+
export type { WshcmUploaderOptions, UploadProgressCallback } from "./uploader.js";
|
|
13
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACrD,YAAY,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC"}
|
package/build/index.js
CHANGED
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @module wshcm
|
|
5
5
|
*/
|
|
6
|
-
export { WshcmClient } from
|
|
7
|
-
export { Evaluator } from
|
|
8
|
-
export { WshcmException, UnauthorizedError } from
|
|
9
|
-
export { renderRequest, parseResponse } from
|
|
10
|
-
export { WshcmUploader } from
|
|
6
|
+
export { WshcmClient } from "./client.js";
|
|
7
|
+
export { Evaluator } from "./evaluator.js";
|
|
8
|
+
export { WshcmException, UnauthorizedError } from "./exceptions.js";
|
|
9
|
+
export { renderRequest, parseResponse } from "./soap-utils.js";
|
|
10
|
+
export { WshcmUploader } from "./uploader.js";
|
|
11
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC"}
|
package/build/soap-utils.d.ts
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"soap-utils.d.ts","sourceRoot":"","sources":["../src/soap-utils.ts"],"names":[],"mappings":"AAiGA;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,MAAM,CAsBpF;AAoHD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG,CAyBvD"}
|