@boristype/ws-client 0.1.0-alpha.2 → 0.1.0-alpha.4
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/build/soap-utils.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { XMLParser, XMLBuilder } from
|
|
2
|
-
import { WshcmException } from
|
|
1
|
+
import { XMLParser, XMLBuilder } from "fast-xml-parser";
|
|
2
|
+
import { WshcmException } from "./exceptions.js";
|
|
3
3
|
// ============================================================================
|
|
4
4
|
// XML Parser / Builder instances
|
|
5
5
|
// ============================================================================
|
|
@@ -7,24 +7,45 @@ import { WshcmException } from './exceptions.js';
|
|
|
7
7
|
* XMLParser для SOAP-ответов.
|
|
8
8
|
* `removeNSPrefix: true` убирает namespace-префиксы (soap:Envelope → Envelope),
|
|
9
9
|
* что позволяет обращаться к элементам напрямую без привязки к префиксам сервера.
|
|
10
|
+
* Текст сохраняется без trim/coercion; тип задаётся атрибутом VALUE-TYPE.
|
|
10
11
|
*/
|
|
11
12
|
const soapParser = new XMLParser({
|
|
13
|
+
htmlEntities: true,
|
|
12
14
|
ignoreAttributes: false,
|
|
13
|
-
attributeNamePrefix:
|
|
15
|
+
attributeNamePrefix: "@_",
|
|
14
16
|
removeNSPrefix: true,
|
|
15
|
-
trimValues:
|
|
17
|
+
trimValues: false,
|
|
18
|
+
parseTagValue: false,
|
|
16
19
|
});
|
|
17
20
|
/**
|
|
18
|
-
*
|
|
19
|
-
*
|
|
21
|
+
* Экранирует XML values за один проход, включая пробельные символы.
|
|
22
|
+
* HCM SOAP parser удаляет trailing literal whitespace. Numeric references
|
|
23
|
+
* сохраняют его, а также CR, который XML 1.0 иначе нормализует в LF.
|
|
20
24
|
*/
|
|
25
|
+
function encodeSoapXmlValue(_name, value) {
|
|
26
|
+
const entities = {
|
|
27
|
+
"&": "&",
|
|
28
|
+
"<": "<",
|
|
29
|
+
">": ">",
|
|
30
|
+
'"': """,
|
|
31
|
+
"'": "'",
|
|
32
|
+
" ": " ",
|
|
33
|
+
"\t": "	",
|
|
34
|
+
"\r": " ",
|
|
35
|
+
"\n": " ",
|
|
36
|
+
};
|
|
37
|
+
return String(value).replace(/[&<>"' \t\r\n]/g, (character) => entities[character]);
|
|
38
|
+
}
|
|
39
|
+
/** XMLBuilder с явным escaping значений для HCM SOAP parser. */
|
|
21
40
|
const soapBuilder = new XMLBuilder({
|
|
22
41
|
ignoreAttributes: false,
|
|
23
|
-
attributeNamePrefix:
|
|
42
|
+
attributeNamePrefix: "@_",
|
|
24
43
|
format: true,
|
|
25
|
-
indentBy:
|
|
44
|
+
indentBy: " ",
|
|
26
45
|
suppressEmptyNode: false,
|
|
27
|
-
processEntities:
|
|
46
|
+
processEntities: false,
|
|
47
|
+
tagValueProcessor: encodeSoapXmlValue,
|
|
48
|
+
attributeValueProcessor: encodeSoapXmlValue,
|
|
28
49
|
});
|
|
29
50
|
// ============================================================================
|
|
30
51
|
// Request Building
|
|
@@ -35,33 +56,33 @@ const soapBuilder = new XMLBuilder({
|
|
|
35
56
|
* @returns объект с VALUE-TYPE атрибутом и текстовым содержимым
|
|
36
57
|
*/
|
|
37
58
|
function buildArgumentValue(arg) {
|
|
38
|
-
if (typeof arg ===
|
|
59
|
+
if (typeof arg === "string") {
|
|
39
60
|
return {
|
|
40
|
-
|
|
41
|
-
|
|
61
|
+
"@_VALUE-TYPE": "string",
|
|
62
|
+
"#text": arg,
|
|
42
63
|
};
|
|
43
64
|
}
|
|
44
|
-
if (typeof arg ===
|
|
65
|
+
if (typeof arg === "number") {
|
|
45
66
|
return {
|
|
46
|
-
|
|
47
|
-
|
|
67
|
+
"@_VALUE-TYPE": Number.isInteger(arg) ? "integer" : "real",
|
|
68
|
+
"#text": arg,
|
|
48
69
|
};
|
|
49
70
|
}
|
|
50
|
-
if (typeof arg ===
|
|
71
|
+
if (typeof arg === "boolean") {
|
|
51
72
|
return {
|
|
52
|
-
|
|
53
|
-
|
|
73
|
+
"@_VALUE-TYPE": "bool",
|
|
74
|
+
"#text": arg ? 1 : 0,
|
|
54
75
|
};
|
|
55
76
|
}
|
|
56
77
|
if (arg === null || arg === undefined) {
|
|
57
|
-
return {
|
|
78
|
+
return { "@_VALUE-TYPE": "string", "#text": "" };
|
|
58
79
|
}
|
|
59
80
|
// Для объектов и массивов — неподдерживаемый тип, используем JSON как строку
|
|
60
81
|
try {
|
|
61
|
-
return {
|
|
82
|
+
return { "@_VALUE-TYPE": "string", "#text": JSON.stringify(arg) };
|
|
62
83
|
}
|
|
63
84
|
catch {
|
|
64
|
-
throw new WshcmException(
|
|
85
|
+
throw new WshcmException("Unsupported argument type");
|
|
65
86
|
}
|
|
66
87
|
}
|
|
67
88
|
/**
|
|
@@ -77,15 +98,15 @@ export function renderRequest(lib, method, methodArgs) {
|
|
|
77
98
|
argData[`arg-${i}`] = buildArgumentValue(methodArgs[i]);
|
|
78
99
|
}
|
|
79
100
|
const requestObj = {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
101
|
+
"?xml": { "@_version": "1.0", "@_encoding": "utf-8" },
|
|
102
|
+
"soap:Envelope": {
|
|
103
|
+
"@_xmlns:soap": "http://schemas.xmlsoap.org/soap/envelope/",
|
|
104
|
+
"@_xmlns": "http://www.datex-soft.com/soap/",
|
|
105
|
+
"soap:Body": {
|
|
106
|
+
CallMethod: {
|
|
107
|
+
LibName: lib,
|
|
108
|
+
MethodName: method,
|
|
109
|
+
ArgData: argData,
|
|
89
110
|
},
|
|
90
111
|
},
|
|
91
112
|
},
|
|
@@ -104,7 +125,7 @@ export function renderRequest(lib, method, methodArgs) {
|
|
|
104
125
|
* @returns найденный элемент или undefined
|
|
105
126
|
*/
|
|
106
127
|
function findElement(obj, key) {
|
|
107
|
-
if (!obj || typeof obj !==
|
|
128
|
+
if (!obj || typeof obj !== "object")
|
|
108
129
|
return undefined;
|
|
109
130
|
const record = obj;
|
|
110
131
|
if (key in record)
|
|
@@ -131,29 +152,29 @@ function parseResultValue(element) {
|
|
|
131
152
|
if (element === undefined || element === null)
|
|
132
153
|
return undefined;
|
|
133
154
|
// Если элемент — примитив (нет атрибутов), вернуть как есть
|
|
134
|
-
if (typeof element !==
|
|
155
|
+
if (typeof element !== "object")
|
|
135
156
|
return element;
|
|
136
|
-
const valueType = element[
|
|
137
|
-
if (!valueType || valueType ===
|
|
157
|
+
const valueType = element["@_VALUE-TYPE"];
|
|
158
|
+
if (!valueType || valueType === "undefined" || valueType === "null") {
|
|
138
159
|
return undefined;
|
|
139
160
|
}
|
|
140
|
-
if (valueType ===
|
|
141
|
-
const text = element[
|
|
142
|
-
return text != null ? String(text) :
|
|
161
|
+
if (valueType === "string") {
|
|
162
|
+
const text = element["#text"];
|
|
163
|
+
return text != null ? String(text) : "";
|
|
143
164
|
}
|
|
144
|
-
if (valueType ===
|
|
145
|
-
return parseInt(String(element[
|
|
165
|
+
if (valueType === "integer") {
|
|
166
|
+
return parseInt(String(element["#text"] ?? "0"), 10);
|
|
146
167
|
}
|
|
147
|
-
if (valueType ===
|
|
148
|
-
return parseFloat(String(element[
|
|
168
|
+
if (valueType === "real") {
|
|
169
|
+
return parseFloat(String(element["#text"] ?? "0"));
|
|
149
170
|
}
|
|
150
|
-
if (valueType ===
|
|
151
|
-
return (element[
|
|
171
|
+
if (valueType === "bool") {
|
|
172
|
+
return (element["#text"] ?? 0) == 1;
|
|
152
173
|
}
|
|
153
|
-
if (valueType ===
|
|
174
|
+
if (valueType === "Object") {
|
|
154
175
|
return parseResultObject(element);
|
|
155
176
|
}
|
|
156
|
-
if (valueType ===
|
|
177
|
+
if (valueType === "Array") {
|
|
157
178
|
return parseResultArray(element);
|
|
158
179
|
}
|
|
159
180
|
throw new WshcmException(`Unexpected VALUE-TYPE: ${valueType}`);
|
|
@@ -169,7 +190,7 @@ function parseResultValue(element) {
|
|
|
169
190
|
function parseResultObject(element) {
|
|
170
191
|
const result = {};
|
|
171
192
|
for (const [key, value] of Object.entries(element)) {
|
|
172
|
-
if (key.startsWith(
|
|
193
|
+
if (key.startsWith("@_") || key === "#text")
|
|
173
194
|
continue;
|
|
174
195
|
result[key] = parseResultValue(value);
|
|
175
196
|
}
|
|
@@ -186,7 +207,7 @@ function parseResultObject(element) {
|
|
|
186
207
|
function parseResultArray(element) {
|
|
187
208
|
const result = [];
|
|
188
209
|
for (const [key, value] of Object.entries(element)) {
|
|
189
|
-
if (key.startsWith(
|
|
210
|
+
if (key.startsWith("@_") || key === "#text")
|
|
190
211
|
continue;
|
|
191
212
|
result.push(parseResultValue(value));
|
|
192
213
|
}
|
|
@@ -202,23 +223,25 @@ function parseResultArray(element) {
|
|
|
202
223
|
* @returns результат выполнения метода
|
|
203
224
|
*/
|
|
204
225
|
export function parseResponse(responseText) {
|
|
226
|
+
// console.log("Raw SOAP response:", responseText);
|
|
205
227
|
const parsed = soapParser.parse(responseText);
|
|
206
228
|
// Проверяем на ошибку SOAP Fault
|
|
207
|
-
const fault = findElement(parsed,
|
|
208
|
-
if (fault && typeof fault ===
|
|
209
|
-
const errorCode = fault.faultcode ??
|
|
210
|
-
const errorMessage = fault.faultstring ??
|
|
229
|
+
const fault = findElement(parsed, "Fault");
|
|
230
|
+
if (fault && typeof fault === "object") {
|
|
231
|
+
const errorCode = fault.faultcode ?? "UNKNOWN";
|
|
232
|
+
const errorMessage = fault.faultstring ?? "Unknown error";
|
|
211
233
|
throw new WshcmException(`ERR: (${errorCode}) ${errorMessage}`);
|
|
212
234
|
}
|
|
213
235
|
// Ищем ResultData
|
|
214
|
-
const resultData = findElement(parsed,
|
|
236
|
+
const resultData = findElement(parsed, "ResultData");
|
|
215
237
|
if (!resultData) {
|
|
216
238
|
return undefined;
|
|
217
239
|
}
|
|
218
240
|
// Ищем Result внутри ResultData
|
|
219
|
-
const result = typeof resultData ===
|
|
241
|
+
const result = typeof resultData === "object" ? resultData.Result : undefined;
|
|
220
242
|
if (result === undefined) {
|
|
221
|
-
throw new WshcmException(
|
|
243
|
+
throw new WshcmException("Unexpected response: Result element not found");
|
|
222
244
|
}
|
|
223
245
|
return parseResultValue(result);
|
|
224
246
|
}
|
|
247
|
+
//# sourceMappingURL=soap-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"soap-utils.js","sourceRoot":"","sources":["../src/soap-utils.ts"],"names":[],"mappings":"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"}
|
package/build/types.d.ts
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,qCAAqC;IACrC,SAAS,EAAE,OAAO,CAAC;IACnB,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,uBAAuB;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB"}
|
package/build/types.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}
|
package/build/uploader.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Evaluator } from
|
|
1
|
+
import { Evaluator } from "./evaluator.js";
|
|
2
2
|
/**
|
|
3
3
|
* Callback для отслеживания прогресса загрузки
|
|
4
4
|
* @param uploadedBytes - количество загруженных байт
|
|
@@ -109,3 +109,4 @@ export declare class WshcmUploader {
|
|
|
109
109
|
*/
|
|
110
110
|
private uploadBatch;
|
|
111
111
|
}
|
|
112
|
+
//# sourceMappingURL=uploader.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../src/uploader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAqE3C;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;AAEzF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,+EAA+E;IAC/E,SAAS,EAAE,SAAS,CAAC;IACrB,+CAA+C;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,+CAA+C;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAS;IAE5B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAK;IAEtB,iDAAiD;IACjD,OAAO,CAAC,QAAQ,CAAc;IAC9B,sDAAsD;IACtD,OAAO,CAAC,UAAU,CAAc;IAEhC,OAAO,CAAC,KAAK,CAAyB;IAGtC,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,UAAU,CAAc;IAEhC;;;;;OAKG;gBACS,OAAO,EAAE,oBAAoB;IAOzC;;;;;;;OAOG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA8D9B;;;;OAIG;IACG,MAAM,CAAC,QAAQ,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB9D;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAuBjC;;OAEG;IACH,OAAO,CAAC,aAAa;IAerB;;OAEG;IACH,OAAO,CAAC,cAAc;IAUtB;;;OAGG;IACH,OAAO,CAAC,WAAW;IA0BnB;;;OAGG;YACW,WAAW;CAoB1B"}
|
package/build/uploader.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as fs from
|
|
2
|
-
import * as path from
|
|
3
|
-
import * as crypto from
|
|
1
|
+
import * as fs from "fs";
|
|
2
|
+
import * as path from "path";
|
|
3
|
+
import * as crypto from "crypto";
|
|
4
4
|
/**
|
|
5
5
|
* Описание файла для загрузки
|
|
6
6
|
*/
|
|
@@ -15,8 +15,8 @@ class FileDescription {
|
|
|
15
15
|
size;
|
|
16
16
|
constructor(filePath, basePath) {
|
|
17
17
|
this.path = filePath;
|
|
18
|
-
this.relative = path.relative(basePath, filePath).replace(/\\/g,
|
|
19
|
-
this.hash = crypto.createHash(
|
|
18
|
+
this.relative = path.relative(basePath, filePath).replace(/\\/g, "/");
|
|
19
|
+
this.hash = crypto.createHash("md5").update(this.relative).digest("hex").toUpperCase();
|
|
20
20
|
this.size = fs.statSync(filePath).size;
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -82,15 +82,15 @@ export class WshcmUploader {
|
|
|
82
82
|
isGlob = false;
|
|
83
83
|
totalSize = 0;
|
|
84
84
|
/** Базовый путь для вычисления relative paths */
|
|
85
|
-
basePath =
|
|
85
|
+
basePath = "";
|
|
86
86
|
/** Имя для finish скрипта (пустое для glob режима) */
|
|
87
|
-
uploadName =
|
|
87
|
+
uploadName = "";
|
|
88
88
|
files = [];
|
|
89
89
|
// Пути на сервере
|
|
90
|
-
destPath =
|
|
91
|
-
tempPath =
|
|
92
|
-
chunkPath1 =
|
|
93
|
-
chunkPath2 =
|
|
90
|
+
destPath = "";
|
|
91
|
+
tempPath = "";
|
|
92
|
+
chunkPath1 = "";
|
|
93
|
+
chunkPath2 = "";
|
|
94
94
|
/**
|
|
95
95
|
* Создает новый загрузчик файлов
|
|
96
96
|
*
|
|
@@ -113,14 +113,14 @@ export class WshcmUploader {
|
|
|
113
113
|
*/
|
|
114
114
|
async prepare() {
|
|
115
115
|
// Проверяем glob-паттерн (dir/* или dir\*)
|
|
116
|
-
if (this.uploadPath.endsWith(
|
|
116
|
+
if (this.uploadPath.endsWith("/*") || this.uploadPath.endsWith("\\*")) {
|
|
117
117
|
this.isGlob = true;
|
|
118
118
|
const dirPath = this.uploadPath.slice(0, -2);
|
|
119
119
|
if (!fs.existsSync(dirPath) || !fs.statSync(dirPath).isDirectory()) {
|
|
120
120
|
throw new Error(`Glob pattern requires existing directory: ${dirPath}`);
|
|
121
121
|
}
|
|
122
122
|
this.basePath = dirPath;
|
|
123
|
-
this.uploadName =
|
|
123
|
+
this.uploadName = ""; // пустое имя сигнализирует glob-режим на сервере
|
|
124
124
|
this.scanDirectory(dirPath, dirPath);
|
|
125
125
|
}
|
|
126
126
|
else {
|
|
@@ -140,7 +140,7 @@ export class WshcmUploader {
|
|
|
140
140
|
this.files.push(fileDesc);
|
|
141
141
|
}
|
|
142
142
|
else {
|
|
143
|
-
throw new Error(
|
|
143
|
+
throw new Error("Path is not a file or directory");
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
146
|
// Сортируем файлы по размеру (от меньших к большим) для эффективного батчинга
|
|
@@ -148,21 +148,19 @@ export class WshcmUploader {
|
|
|
148
148
|
// Вычисляем общий размер
|
|
149
149
|
this.totalSize = this.files.reduce((sum, file) => sum + file.size, 0);
|
|
150
150
|
// Читаем скрипт подготовки
|
|
151
|
-
const prepareScript = fs.readFileSync(path.join(import.meta.dirname,
|
|
151
|
+
const prepareScript = fs.readFileSync(path.join(import.meta.dirname, "..", "resources", "upload_prepare.bs"), "utf-8");
|
|
152
152
|
// Заменяем переменную
|
|
153
|
-
const script = prepareScript.replace(
|
|
153
|
+
const script = prepareScript.replace("{{destination}}", this.destination);
|
|
154
154
|
// Выполняем на сервере
|
|
155
|
-
const response = await this.evaluator.eval(script);
|
|
155
|
+
const response = (await this.evaluator.eval(script));
|
|
156
156
|
// Сохраняем пути
|
|
157
|
-
this.destPath = response.dest_path.replace(/\\/g,
|
|
158
|
-
this.tempPath = response.temp_path.replace(/\\/g,
|
|
159
|
-
const [part1, part2] = response.chunk_path.split(
|
|
160
|
-
this.chunkPath1 = part1.replace(/\\/g,
|
|
161
|
-
this.chunkPath2 = part2.replace(/\\/g,
|
|
157
|
+
this.destPath = response.dest_path.replace(/\\/g, "\\\\");
|
|
158
|
+
this.tempPath = response.temp_path.replace(/\\/g, "\\\\");
|
|
159
|
+
const [part1, part2] = response.chunk_path.split("RELATIVE_PATH_HASH");
|
|
160
|
+
this.chunkPath1 = part1.replace(/\\/g, "\\\\");
|
|
161
|
+
this.chunkPath2 = part2.replace(/\\/g, "\\\\");
|
|
162
162
|
// Создаем директории для чанков на сервере
|
|
163
|
-
const obtainDirCode = this.files
|
|
164
|
-
.map(file => `ObtainDirectory('${this.chunkPath1}${file.hash}', true);`)
|
|
165
|
-
.join('\n');
|
|
163
|
+
const obtainDirCode = this.files.map((file) => `ObtainDirectory('${this.chunkPath1}${file.hash}', true);`).join("\n");
|
|
166
164
|
await this.evaluator.eval(obtainDirCode);
|
|
167
165
|
}
|
|
168
166
|
/**
|
|
@@ -193,18 +191,18 @@ export class WshcmUploader {
|
|
|
193
191
|
*/
|
|
194
192
|
async finish() {
|
|
195
193
|
// Читаем скрипт финализации
|
|
196
|
-
const finishScript = fs.readFileSync(path.join(import.meta.dirname,
|
|
194
|
+
const finishScript = fs.readFileSync(path.join(import.meta.dirname, "..", "resources", "upload_finish.bs"), "utf-8");
|
|
197
195
|
// Заменяем переменные
|
|
198
|
-
const filePaths = JSON.stringify(this.files.map(f => f.relative));
|
|
196
|
+
const filePaths = JSON.stringify(this.files.map((f) => f.relative));
|
|
199
197
|
let script = finishScript;
|
|
200
|
-
script = script.replace(
|
|
201
|
-
script = script.replace(
|
|
202
|
-
script = script.replace(
|
|
203
|
-
script = script.replace(
|
|
198
|
+
script = script.replace("{{file_name}}", this.uploadName);
|
|
199
|
+
script = script.replace("{{dest_path}}", this.destPath);
|
|
200
|
+
script = script.replace("{{temp_path}}", this.tempPath);
|
|
201
|
+
script = script.replace("{{file_paths}}", filePaths);
|
|
204
202
|
// Выполняем на сервере
|
|
205
|
-
const response = await this.evaluator.eval(script);
|
|
203
|
+
const response = (await this.evaluator.eval(script));
|
|
206
204
|
if (response.error) {
|
|
207
|
-
throw new Error(response.message ||
|
|
205
|
+
throw new Error(response.message || "Upload finish failed");
|
|
208
206
|
}
|
|
209
207
|
return response.value || [];
|
|
210
208
|
}
|
|
@@ -269,15 +267,16 @@ export class WshcmUploader {
|
|
|
269
267
|
for (const chunk of batch) {
|
|
270
268
|
const size = chunk.chunkEnd - chunk.chunkStart;
|
|
271
269
|
const buffer = Buffer.alloc(size);
|
|
272
|
-
const fd = await fs.promises.open(chunk.path,
|
|
270
|
+
const fd = await fs.promises.open(chunk.path, "r");
|
|
273
271
|
await fd.read(buffer, 0, size, chunk.chunkStart);
|
|
274
272
|
await fd.close();
|
|
275
|
-
const encoded = buffer.toString(
|
|
273
|
+
const encoded = buffer.toString("base64");
|
|
276
274
|
const serverPath = `${this.chunkPath1}${chunk.hash}${this.chunkPath2}_${chunk.index}`;
|
|
277
275
|
statements.push(`PutFileData('${serverPath}', Base64Decode('${encoded}'))`);
|
|
278
276
|
totalSize += size;
|
|
279
277
|
}
|
|
280
|
-
await this.evaluator.eval(statements.join(
|
|
278
|
+
await this.evaluator.eval(statements.join("\n"));
|
|
281
279
|
return totalSize;
|
|
282
280
|
}
|
|
283
281
|
}
|
|
282
|
+
//# sourceMappingURL=uploader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../src/uploader.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@boristype/ws-client",
|
|
3
|
-
"version": "0.1.0-alpha.
|
|
3
|
+
"version": "0.1.0-alpha.4",
|
|
4
4
|
"description": "WSHCM SOAP client — клиент для работы с WebSoft HCM через SP-XML API",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "build/index.js",
|
|
@@ -11,11 +11,11 @@
|
|
|
11
11
|
"README.md"
|
|
12
12
|
],
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"fast-xml-parser": "^5.
|
|
14
|
+
"fast-xml-parser": "^5.11.2"
|
|
15
15
|
},
|
|
16
16
|
"devDependencies": {
|
|
17
|
-
"@types/node": "^24.
|
|
18
|
-
"typescript": "^
|
|
17
|
+
"@types/node": "^24.19.2",
|
|
18
|
+
"typescript": "^6.0.3"
|
|
19
19
|
},
|
|
20
20
|
"keywords": [
|
|
21
21
|
"wshcm",
|
|
@@ -37,9 +37,10 @@
|
|
|
37
37
|
"access": "public"
|
|
38
38
|
},
|
|
39
39
|
"engines": {
|
|
40
|
-
"node": ">=
|
|
40
|
+
"node": ">=24.0.0"
|
|
41
41
|
},
|
|
42
42
|
"scripts": {
|
|
43
|
-
"build": "tsc"
|
|
43
|
+
"build": "tsc",
|
|
44
|
+
"test": "node --test test/*.test.mjs"
|
|
44
45
|
}
|
|
45
46
|
}
|