@guanjinke/artifact-client 1.7.2 → 1.9.0
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/README.md +3 -6
- package/dist/cli/environment.d.ts +1 -10
- package/dist/cli/environment.d.ts.map +1 -1
- package/dist/cli/environment.js +0 -24
- package/dist/cli/environment.js.map +1 -1
- package/dist/cli/setup.js +5 -8
- package/dist/cli/setup.js.map +1 -1
- package/dist/environment/builder.d.ts +4 -0
- package/dist/environment/builder.d.ts.map +1 -1
- package/dist/environment/builder.js +31 -20
- package/dist/environment/builder.js.map +1 -1
- package/dist/environment/catalog.d.ts +8 -0
- package/dist/environment/catalog.d.ts.map +1 -1
- package/dist/environment/catalog.js +25 -0
- package/dist/environment/catalog.js.map +1 -1
- package/dist/environment/package-resource.d.ts +7 -1
- package/dist/environment/package-resource.d.ts.map +1 -1
- package/dist/environment/package-resource.js +8 -2
- package/dist/environment/package-resource.js.map +1 -1
- package/dist/environment/plan.d.ts +26 -5
- package/dist/environment/plan.d.ts.map +1 -1
- package/dist/environment/plan.js +63 -11
- package/dist/environment/plan.js.map +1 -1
- package/dist/environment/types.d.ts +17 -9
- package/dist/environment/types.d.ts.map +1 -1
- package/dist/environment/update.d.ts +9 -29
- package/dist/environment/update.d.ts.map +1 -1
- package/dist/environment/update.js +375 -95
- package/dist/environment/update.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/web/static/app.js +1 -1
- package/package.json +2 -3
- package/resources/3DScene/capeHill.hdr +0 -0
- package/resources/3DScene/defaultGround.jpg +0 -0
- package/resources/3DScene/environmentSpecular.env +0 -0
- package/resources/3DScene/flare.png +0 -0
- package/resources/3DScene/geometry1.png +0 -0
- package/resources/3DScene/geometry10.png +0 -0
- package/resources/3DScene/geometry11.png +0 -0
- package/resources/3DScene/geometry12.png +0 -0
- package/resources/3DScene/geometry13.png +0 -0
- package/resources/3DScene/geometry2.png +0 -0
- package/resources/3DScene/geometry3.png +0 -0
- package/resources/3DScene/geometry4.png +0 -0
- package/resources/3DScene/geometry5.png +0 -0
- package/resources/3DScene/geometry6.png +0 -0
- package/resources/3DScene/geometry7.png +0 -0
- package/resources/3DScene/geometry8.png +0 -0
- package/resources/3DScene/geometry9.png +0 -0
- package/resources/3DScene/lilienstein.hdr +0 -0
- package/resources/3DScene/sky.hdr +0 -0
- package/resources/3DScene/studio.env +0 -0
- package/resources/3DScene/wastelandCloudsPureSky.hdr +0 -0
|
@@ -195,8 +195,14 @@ async function checkDestinationDirectory(directory) {
|
|
|
195
195
|
* with the expected path, before anything is written, exactly like
|
|
196
196
|
* `copyBundledResource` fails a create — an environment whose 3D scene designer
|
|
197
197
|
* cannot load its assets is broken rather than degraded.
|
|
198
|
+
*
|
|
199
|
+
* `assumeMissing` covers an update that replaces a directory this tree lives in:
|
|
200
|
+
* the Server module owns `Server/`, so refreshing it removes the whole
|
|
201
|
+
* `wwwroot/3DScene` tree moments later. Classifying against content that is about
|
|
202
|
+
* to be deleted would report every file identical, write nothing, and leave the
|
|
203
|
+
* environment with no 3D scene assets at all.
|
|
198
204
|
*/
|
|
199
|
-
async function planBundledResource(source, destination) {
|
|
205
|
+
async function planBundledResource(source, destination, assumeMissing = false) {
|
|
200
206
|
await resourceRoot(source, destination);
|
|
201
207
|
await checkDestinationDirectory(destination);
|
|
202
208
|
const files = [];
|
|
@@ -211,7 +217,7 @@ async function planBundledResource(source, destination) {
|
|
|
211
217
|
}
|
|
212
218
|
if (!entry.isFile())
|
|
213
219
|
throw new Error(`Unexpected link in bundled resource ${source}: ${child}.`);
|
|
214
|
-
files.push({ relative: child, status: await fileStatus(path.join(from, entry.name), path.join(to, entry.name)) });
|
|
220
|
+
files.push({ relative: child, status: assumeMissing ? 'missing' : await fileStatus(path.join(from, entry.name), path.join(to, entry.name)) });
|
|
215
221
|
}
|
|
216
222
|
};
|
|
217
223
|
await visit(source, destination, '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-resource.js","sourceRoot":"","sources":["../../src/environment/package-resource.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BA,8DAEC;AAGD,4DAEC;AA4BD,kDA8BC;
|
|
1
|
+
{"version":3,"file":"package-resource.js","sourceRoot":"","sources":["../../src/environment/package-resource.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,19 +23,40 @@ export declare const optionalModulesByEdition: Record<'cn' | 'en', EnvironmentMo
|
|
|
23
23
|
/** Every selectable optional module, in the order errors and the UI list them. */
|
|
24
24
|
export declare const optionalModules: EnvironmentModule[];
|
|
25
25
|
/** Components every environment contains, selected or not. */
|
|
26
|
-
export declare const
|
|
26
|
+
export declare const autoAddedModules: string[];
|
|
27
|
+
/**
|
|
28
|
+
* Built-in modules deployed **after** every other module, in this order.
|
|
29
|
+
*
|
|
30
|
+
* `dashboard-resource` ships the 3D scene and map assets the Server serves from
|
|
31
|
+
* its web root. It is built in and invisible: no `--modules` value can select,
|
|
32
|
+
* add or remove it, it is never an optional module and it has no local source.
|
|
33
|
+
* It is only deployed when the environment's major publishes it — a major
|
|
34
|
+
* without a version pointer (9.1 has no `wyn-dashboard-resource` line) simply
|
|
35
|
+
* does not get it, and the plan says so in one warning.
|
|
36
|
+
*/
|
|
37
|
+
export declare const trailingModules: string[];
|
|
27
38
|
/**
|
|
28
39
|
* Modules a selection pulls in on its own, because the selected module cannot
|
|
29
40
|
* work without them — smart documents requires the collaboration service.
|
|
30
41
|
*/
|
|
31
42
|
export declare function dependencyModules(selected: readonly string[]): string[];
|
|
32
43
|
/**
|
|
33
|
-
* The complete module
|
|
34
|
-
*
|
|
35
|
-
* builds the artifacts from this and `builder.ts` re-derives it to
|
|
36
|
-
* untrusted plan, so the two can never disagree.
|
|
44
|
+
* The complete module order of a plan: core components, automatically added
|
|
45
|
+
* dependencies, what the caller selected, and the built-in trailing modules.
|
|
46
|
+
* `plan.ts` builds the artifacts from this and `builder.ts` re-derives it to
|
|
47
|
+
* validate an untrusted plan, so the two can never disagree.
|
|
48
|
+
*
|
|
49
|
+
* A trailing module is only part of a plan that really deploys it: the caller
|
|
50
|
+
* filters the returned list against the module's availability for the major.
|
|
37
51
|
*/
|
|
38
52
|
export declare function plannedModules(selected: readonly string[]): string[];
|
|
53
|
+
/**
|
|
54
|
+
* The modules of `plannedModules(selected)` this environment really deploys:
|
|
55
|
+
* a built-in trailing module that the major publishes no pointer for is left out
|
|
56
|
+
* of both the artifact list and the recorded automatically added modules, so a
|
|
57
|
+
* 9.1 plan looks exactly like it did before the module existed.
|
|
58
|
+
*/
|
|
59
|
+
export declare function deployableModules(selected: readonly string[], available: readonly string[]): string[];
|
|
39
60
|
export declare function validateEnvironmentOptions(options: EnvironmentOptions): Promise<EnvironmentOptions & {
|
|
40
61
|
edition: 'cn' | 'en';
|
|
41
62
|
profile: 'embedded';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../src/environment/plan.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEpG,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CA6B9G;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS;;;CAAyC,CAAC;AAEhE,sEAAsE;AACtE,eAAO,MAAM,WAAW,EAAE,MAAwB,CAAC;AAEnD;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,IAAI,GAAG,IAAI,EAAE,iBAAiB,EAAE,CAG7E,CAAC;AAEF,kFAAkF;AAClF,eAAO,MAAM,eAAe,EAAE,iBAAiB,EAAiE,CAAC;AAEjH,8DAA8D;AAC9D,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../src/environment/plan.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEpG,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CA6B9G;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS;;;CAAyC,CAAC;AAEhE,sEAAsE;AACtE,eAAO,MAAM,WAAW,EAAE,MAAwB,CAAC;AAEnD;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,IAAI,GAAG,IAAI,EAAE,iBAAiB,EAAE,CAG7E,CAAC;AAEF,kFAAkF;AAClF,eAAO,MAAM,eAAe,EAAE,iBAAiB,EAAiE,CAAC;AAEjH,8DAA8D;AAC9D,eAAO,MAAM,gBAAgB,EAAE,MAAM,EAAmD,CAAC;AAEzF;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,EAAE,MAAM,EAA2B,CAAC;AAEhE;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAEvE;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAEpE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAAE,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAGrG;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,GAAG;IAAE,OAAO,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,iBAAiB,EAAE,CAAA;CAAE,CAAC,CAkBrM;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,iBAAiB,EAAE,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,CAwDnK"}
|
package/dist/environment/plan.js
CHANGED
|
@@ -33,10 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.
|
|
36
|
+
exports.trailingModules = exports.autoAddedModules = exports.optionalModules = exports.optionalModulesByEdition = exports.defaultPort = exports.portRange = void 0;
|
|
37
37
|
exports.validateTarget = validateTarget;
|
|
38
38
|
exports.dependencyModules = dependencyModules;
|
|
39
39
|
exports.plannedModules = plannedModules;
|
|
40
|
+
exports.deployableModules = deployableModules;
|
|
40
41
|
exports.validateEnvironmentOptions = validateEnvironmentOptions;
|
|
41
42
|
exports.buildEnvironmentPlan = buildEnvironmentPlan;
|
|
42
43
|
const fs = __importStar(require("fs/promises"));
|
|
@@ -105,7 +106,18 @@ exports.optionalModulesByEdition = {
|
|
|
105
106
|
/** Every selectable optional module, in the order errors and the UI list them. */
|
|
106
107
|
exports.optionalModules = [...new Set(Object.values(exports.optionalModulesByEdition).flat())];
|
|
107
108
|
/** Components every environment contains, selected or not. */
|
|
108
|
-
exports.
|
|
109
|
+
exports.autoAddedModules = ['server', 'monitoring', 'common', 'analysis'];
|
|
110
|
+
/**
|
|
111
|
+
* Built-in modules deployed **after** every other module, in this order.
|
|
112
|
+
*
|
|
113
|
+
* `dashboard-resource` ships the 3D scene and map assets the Server serves from
|
|
114
|
+
* its web root. It is built in and invisible: no `--modules` value can select,
|
|
115
|
+
* add or remove it, it is never an optional module and it has no local source.
|
|
116
|
+
* It is only deployed when the environment's major publishes it — a major
|
|
117
|
+
* without a version pointer (9.1 has no `wyn-dashboard-resource` line) simply
|
|
118
|
+
* does not get it, and the plan says so in one warning.
|
|
119
|
+
*/
|
|
120
|
+
exports.trailingModules = ['dashboard-resource'];
|
|
109
121
|
/**
|
|
110
122
|
* Modules a selection pulls in on its own, because the selected module cannot
|
|
111
123
|
* work without them — smart documents requires the collaboration service.
|
|
@@ -114,13 +126,26 @@ function dependencyModules(selected) {
|
|
|
114
126
|
return selected.includes('documents') ? ['collaboration'] : [];
|
|
115
127
|
}
|
|
116
128
|
/**
|
|
117
|
-
* The complete module
|
|
118
|
-
*
|
|
119
|
-
* builds the artifacts from this and `builder.ts` re-derives it to
|
|
120
|
-
* untrusted plan, so the two can never disagree.
|
|
129
|
+
* The complete module order of a plan: core components, automatically added
|
|
130
|
+
* dependencies, what the caller selected, and the built-in trailing modules.
|
|
131
|
+
* `plan.ts` builds the artifacts from this and `builder.ts` re-derives it to
|
|
132
|
+
* validate an untrusted plan, so the two can never disagree.
|
|
133
|
+
*
|
|
134
|
+
* A trailing module is only part of a plan that really deploys it: the caller
|
|
135
|
+
* filters the returned list against the module's availability for the major.
|
|
121
136
|
*/
|
|
122
137
|
function plannedModules(selected) {
|
|
123
|
-
return [...exports.
|
|
138
|
+
return [...exports.autoAddedModules, ...dependencyModules(selected), ...selected, ...exports.trailingModules];
|
|
139
|
+
}
|
|
140
|
+
/**
|
|
141
|
+
* The modules of `plannedModules(selected)` this environment really deploys:
|
|
142
|
+
* a built-in trailing module that the major publishes no pointer for is left out
|
|
143
|
+
* of both the artifact list and the recorded automatically added modules, so a
|
|
144
|
+
* 9.1 plan looks exactly like it did before the module existed.
|
|
145
|
+
*/
|
|
146
|
+
function deployableModules(selected, available) {
|
|
147
|
+
const published = new Set(available);
|
|
148
|
+
return plannedModules(selected).filter(module => !exports.trailingModules.includes(module) || published.has(module));
|
|
124
149
|
}
|
|
125
150
|
async function validateEnvironmentOptions(options) {
|
|
126
151
|
if (!options.root || !options.major || !/^(9\.1(?:-[A-Za-z0-9][A-Za-z0-9._-]*)?|dev)$/.test(options.major))
|
|
@@ -135,7 +160,10 @@ async function validateEnvironmentOptions(options) {
|
|
|
135
160
|
if (!Number.isInteger(port) || port < 1 || port > 65535)
|
|
136
161
|
throw new Error('Port must be an integer between 1 and 65535.');
|
|
137
162
|
const requestedModules = [...new Set((options.modules ?? []).flatMap(m => m.split(',')).map(m => m.trim()).filter(Boolean))];
|
|
138
|
-
|
|
163
|
+
// The built-in parts of an environment are accepted-and-ignored in `--modules`
|
|
164
|
+
// exactly like the core components: naming them never selects, adds or removes
|
|
165
|
+
// anything. `dashboard-resource` is deployed by the plan itself.
|
|
166
|
+
const modules = requestedModules.filter(m => !['server', 'account', 'dataset', 'analysis', 'cot-worker', 'common', 'monitoring', ...exports.trailingModules].includes(m)).sort();
|
|
139
167
|
if (modules.some(m => !exports.optionalModules.includes(m)))
|
|
140
168
|
throw new Error(`Select optional modules: ${exports.optionalModules.join(', ')}. Wyn core server, account, dataset, analysis model and cot worker are always included.`);
|
|
141
169
|
const unsupported = modules.filter(m => !exports.optionalModulesByEdition[edition].includes(m));
|
|
@@ -147,8 +175,32 @@ async function validateEnvironmentOptions(options) {
|
|
|
147
175
|
async function buildEnvironmentPlan(options, client, onProgress) {
|
|
148
176
|
onProgress?.('Validating environment options and target directory');
|
|
149
177
|
const normalized = await validateEnvironmentOptions(options);
|
|
150
|
-
const modules = plannedModules(normalized.modules);
|
|
151
178
|
const selected = new Set(normalized.modules);
|
|
179
|
+
const warnings = ['No services are registered or started.', 'Wyn core server, account, dataset, analysis model and cot worker are always included.', 'License, sample data, bootstrap data and optional language/styles-cache archives are not provisioned.'];
|
|
180
|
+
// Availability is per major and only checked for the built-in trailing modules:
|
|
181
|
+
// a major that publishes no version pointer for one (9.1 has no
|
|
182
|
+
// `wyn-dashboard-resource` line) does not get it, and the plan says so once.
|
|
183
|
+
// The probe runs before the artifact loop so the plan lists — and counts —
|
|
184
|
+
// only the modules this environment really deploys. A pointer that exists but
|
|
185
|
+
// cannot be resolved (an invalid version, a missing or ambiguous ZIP) stays a
|
|
186
|
+
// hard error in the loop below, exactly like every other module.
|
|
187
|
+
const resolved = new Map();
|
|
188
|
+
for (const module of exports.trailingModules) {
|
|
189
|
+
const entry = catalog_1.catalog[module];
|
|
190
|
+
let pointer;
|
|
191
|
+
try {
|
|
192
|
+
pointer = await client.getLatestVersion(entry.plugin, normalized.major);
|
|
193
|
+
}
|
|
194
|
+
catch {
|
|
195
|
+
warnings.push(`${entry.plugin} is not published for major ${normalized.major}; 3D scene and map resources were not deployed.`);
|
|
196
|
+
continue;
|
|
197
|
+
}
|
|
198
|
+
if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(pointer.version))
|
|
199
|
+
throw new Error(`Unable to resolve artifacts for ${entry.plugin}/${normalized.major}.`);
|
|
200
|
+
resolved.set(module, pointer.version);
|
|
201
|
+
onProgress?.(`${entry.plugin} is published for major ${normalized.major}; it will be deployed last`);
|
|
202
|
+
}
|
|
203
|
+
const modules = deployableModules(normalized.modules, [...resolved.keys()]);
|
|
152
204
|
const autoAddedModules = modules.filter(module => !selected.has(module));
|
|
153
205
|
const artifacts = [];
|
|
154
206
|
for (const [index, module] of modules.entries()) {
|
|
@@ -157,7 +209,7 @@ async function buildEnvironmentPlan(options, client, onProgress) {
|
|
|
157
209
|
let version;
|
|
158
210
|
let files;
|
|
159
211
|
try {
|
|
160
|
-
version = (await client.getLatestVersion(entry.plugin, normalized.major)).version;
|
|
212
|
+
version = resolved.get(module) ?? (await client.getLatestVersion(entry.plugin, normalized.major)).version;
|
|
161
213
|
if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(version))
|
|
162
214
|
throw new Error('Invalid resolved version');
|
|
163
215
|
files = await client.listArtifacts(entry.plugin, version);
|
|
@@ -179,7 +231,7 @@ async function buildEnvironmentPlan(options, client, onProgress) {
|
|
|
179
231
|
return {
|
|
180
232
|
root: normalized.root, major: normalized.major, schema: 'pending', edition: normalized.edition, profile: normalized.profile, port: normalized.port,
|
|
181
233
|
selectedModules: normalized.modules, autoAddedModules, artifacts,
|
|
182
|
-
warnings
|
|
234
|
+
warnings,
|
|
183
235
|
requirements: ['Windows for execution.', '.NET runtime requirements are discovered from downloaded runtimeconfig files.', 'A valid license and database initialization may be required before startup.'],
|
|
184
236
|
};
|
|
185
237
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../src/environment/plan.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,wCA6BC;
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../src/environment/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,11 +16,26 @@ export interface LayoutMapping {
|
|
|
16
16
|
/**
|
|
17
17
|
* .NET assemblies this mapping must contain. Empty for a `service` mapping:
|
|
18
18
|
* an out-of-process native service that ships no managed assembly and is
|
|
19
|
-
* loaded by the Server from its `<Services>` declaration alone.
|
|
19
|
+
* loaded by the Server from its `<Services>` declaration alone. Empty for a
|
|
20
|
+
* `resource` mapping too: it is a static file tree the Server only serves.
|
|
20
21
|
*/
|
|
21
22
|
assemblies: string[];
|
|
22
|
-
|
|
23
|
+
/**
|
|
24
|
+
* `resource` is a static tree deployed into the environment's web root for the
|
|
25
|
+
* Server to serve (the built-in `dashboard-resource` module's 3D scene and map
|
|
26
|
+
* assets). It carries no assembly, needs no `.runtimeconfig.json`, and adds
|
|
27
|
+
* nothing to `conf/Wyn.conf`.
|
|
28
|
+
*/
|
|
29
|
+
role: 'plugin' | 'worker' | 'server' | 'monitor' | 'service' | 'resource';
|
|
23
30
|
service?: string;
|
|
31
|
+
/**
|
|
32
|
+
* Edition this mapping belongs to. A mapping without one is deployed for every
|
|
33
|
+
* edition; a tagged mapping is deployed **only** when the environment has that
|
|
34
|
+
* edition, and is never required, copied or referenced otherwise — which is how
|
|
35
|
+
* `map-cn` and `map-en` both land in `Server/wwwroot/map` without one edition
|
|
36
|
+
* ever needing the other's directory.
|
|
37
|
+
*/
|
|
38
|
+
edition?: 'cn' | 'en';
|
|
24
39
|
}
|
|
25
40
|
export interface EnvironmentArtifact {
|
|
26
41
|
module: string;
|
|
@@ -67,12 +82,5 @@ export interface EnvironmentDependencies {
|
|
|
67
82
|
id: string;
|
|
68
83
|
name: string;
|
|
69
84
|
};
|
|
70
|
-
/**
|
|
71
|
-
* Root directory of the resource trees bundled with this package, for
|
|
72
|
-
* `create-env`'s layout of `resources/<name>` into the environment. Injectable
|
|
73
|
-
* so a test can point at a fixture tree; the default is the `resources`
|
|
74
|
-
* directory beside the installed package.
|
|
75
|
-
*/
|
|
76
|
-
bundledResourcesDirectory?: string;
|
|
77
85
|
}
|
|
78
86
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/environment/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,eAAe,CAAC;AAClH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AACD,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,EAAE,kBAAkB,GAAG,eAAe,GAAG,kBAAkB,CAAC,CAAC;AAChH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/environment/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,eAAe,CAAC;AAClH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AACD,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,EAAE,kBAAkB,GAAG,eAAe,GAAG,kBAAkB,CAAC,CAAC;AAChH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB;;;;;OAKG;IACH,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;IAC1E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACvB;AACD,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B;AACD,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,MAAM,CAAC;AAC/C,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACpE,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACtC,OAAO,EAAE,IAAI,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,UAAU,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,iBAAiB,EAAE,CAAC;IACrC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,SAAS,EAAE,mBAAmB,EAAE,CAAC;IACjC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AACD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AACD,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAE5D,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,6FAA6F;IAC7F,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,gEAAgE;IAChE,OAAO,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACxC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EnvironmentRegistry } from './registry';
|
|
2
2
|
import { ProcessBackend } from './process';
|
|
3
3
|
import { EnvironmentClient, EnvironmentProgress } from './types';
|
|
4
|
-
/**
|
|
4
|
+
/** Every catalog module can be updated remotely; local overrides are excluded per environment. */
|
|
5
5
|
export declare const updatableModules: string[];
|
|
6
6
|
export interface ModuleUpdateSpec {
|
|
7
7
|
module: string;
|
|
@@ -31,21 +31,6 @@ export interface ModuleChange {
|
|
|
31
31
|
copiedDirectories: string[];
|
|
32
32
|
removedDirectories: string[];
|
|
33
33
|
}
|
|
34
|
-
/**
|
|
35
|
-
* What an update did (or, in a dry run, would do) to one bundled resource tree.
|
|
36
|
-
*
|
|
37
|
-
* `added` counts files the environment did not have yet and `updated` counts
|
|
38
|
-
* files whose destination content differed and was refreshed; `files` is the size
|
|
39
|
-
* of the packaged tree, exactly as the lock manifest records it.
|
|
40
|
-
*/
|
|
41
|
-
export interface ResourceChange {
|
|
42
|
-
name: string;
|
|
43
|
-
source: string;
|
|
44
|
-
destination: string;
|
|
45
|
-
files: number;
|
|
46
|
-
added: number;
|
|
47
|
-
updated: number;
|
|
48
|
-
}
|
|
49
34
|
export interface UpdateResult {
|
|
50
35
|
name: string;
|
|
51
36
|
root: string;
|
|
@@ -58,32 +43,25 @@ export interface UpdateResult {
|
|
|
58
43
|
restartRequired: boolean;
|
|
59
44
|
warnings: string[];
|
|
60
45
|
localTargets: LocalTarget[];
|
|
61
|
-
resource: ResourceChange;
|
|
62
46
|
}
|
|
63
47
|
export interface UpdateDependencies {
|
|
64
48
|
registry?: EnvironmentRegistry;
|
|
65
49
|
processes?: ProcessBackend;
|
|
66
50
|
platform?: NodeJS.Platform;
|
|
67
51
|
onProgress?: EnvironmentProgress;
|
|
68
|
-
/**
|
|
69
|
-
* Root directory of the resource trees bundled with this package, for
|
|
70
|
-
* `update-env`'s layout of `resources/<name>` into an existing environment.
|
|
71
|
-
* Injectable so a test can point at a fixture tree; the default is the
|
|
72
|
-
* `resources` directory beside the installed package (the same seam
|
|
73
|
-
* `EnvironmentDependencies.bundledResourcesDirectory` gives `create-env`).
|
|
74
|
-
*/
|
|
75
|
-
bundledResourcesDirectory?: string;
|
|
76
52
|
}
|
|
77
53
|
/**
|
|
78
54
|
* One `<Server><Plugins>` or `<Server><PluginWorkers>` entry: where it is
|
|
79
55
|
* deployed and what it loads. A worker entry additionally names the service
|
|
80
|
-
* whose `WorkingDirectory` and `Assembly` follow the entry
|
|
56
|
+
* whose `WorkingDirectory` and `Assembly` follow the entry; a `server` entry is
|
|
57
|
+
* the Server service the Monitor starts, and a `service` entry is a native
|
|
58
|
+
* out-of-process service declared as an empty node.
|
|
81
59
|
*/
|
|
82
60
|
export interface PluginEntry {
|
|
83
61
|
destination: string;
|
|
84
62
|
assemblies: string[];
|
|
85
63
|
path: string;
|
|
86
|
-
role?: 'plugin' | 'worker';
|
|
64
|
+
role?: 'plugin' | 'worker' | 'server' | 'service';
|
|
87
65
|
service?: string;
|
|
88
66
|
}
|
|
89
67
|
/**
|
|
@@ -105,7 +83,10 @@ export declare function parseModuleSpecs(values: string[]): ModuleUpdateSpec[];
|
|
|
105
83
|
* is returned. Dashboard stays the first `Plugins` entry; every other entry keeps
|
|
106
84
|
* its order. A worker service keeps all of its other fields, including
|
|
107
85
|
* `Disabled`; a configuration without that node is updated through
|
|
108
|
-
* `<PluginWorkers>` alone.
|
|
86
|
+
* `<PluginWorkers>` alone. The Server service is kept in step the same way a
|
|
87
|
+
* worker is, and a native service the environment does not declare yet gets the
|
|
88
|
+
* empty node `create-env` writes, so a freshly installed collaboration service is
|
|
89
|
+
* actually loaded.
|
|
109
90
|
*/
|
|
110
91
|
export declare function patchEnvironmentConfiguration(xml: string, entries: PluginEntry[], platform?: NodeJS.Platform): string;
|
|
111
92
|
/**
|
|
@@ -122,7 +103,6 @@ export declare class EnvironmentUpdater {
|
|
|
122
103
|
readonly registry: EnvironmentRegistry;
|
|
123
104
|
private readonly processes;
|
|
124
105
|
private readonly platform;
|
|
125
|
-
private readonly bundledResources;
|
|
126
106
|
private readonly onProgress?;
|
|
127
107
|
constructor(dependencies?: UpdateDependencies);
|
|
128
108
|
update(name: string, specs: (ModuleUpdateSpec | string)[], clientFactory: () => EnvironmentClient, options?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/environment/update.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/environment/update.ts"],"names":[],"mappings":"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"}
|