@marsx-dev/launcher 0.0.33 → 0.0.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/configuration.js +3 -3
- package/dist/loader.d.ts.map +1 -1
- package/dist/loader.js +38 -38
- package/package.json +1 -1
- package/src/configuration.ts +2 -2
- package/src/loader.ts +45 -39
package/dist/configuration.js
CHANGED
|
@@ -55,8 +55,8 @@ const ConfigSchema = yup.object().shape({
|
|
|
55
55
|
.string()
|
|
56
56
|
.required()
|
|
57
57
|
.transform(v => path_1.default.resolve(v)),
|
|
58
|
-
compileCache: yup.boolean().
|
|
59
|
-
saveImportedBlocks: yup.boolean().
|
|
58
|
+
compileCache: yup.boolean().required(),
|
|
59
|
+
saveImportedBlocks: yup.boolean().required(),
|
|
60
60
|
mongoConn: yup.string().required(),
|
|
61
61
|
mongoDbName: yup.string().required(),
|
|
62
62
|
azureStorageConnection: yup.string().required(),
|
|
@@ -151,4 +151,4 @@ function getEnvVarMapping() {
|
|
|
151
151
|
return result;
|
|
152
152
|
}
|
|
153
153
|
exports.CustomEnvironmentVariables = getEnvVarMapping();
|
|
154
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
154
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlndXJhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25maWd1cmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0RBQTBCO0FBRTFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsNEJBQTRCLENBQUMsR0FBRyxNQUFNLENBQUM7QUFDbkQsb0RBQWtDO0FBQ2xDLG9EQUF1QjtBQUN2QixnREFBd0I7QUFDeEIseUNBQTJCO0FBQzNCLDZCQUFzQztBQUV0QyxNQUFNLGVBQWUsR0FBRyxtQkFBbUIsQ0FBQztBQTZCNUMsTUFBYSxXQUFZLFNBQVEsS0FBSztDQUFHO0FBQXpDLGtDQUF5QztBQUV6QyxNQUFNLG1CQUFtQixHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUM7SUFDckMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDN0IsR0FBRyxFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDbEMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDaEMsY0FBYyxFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7Q0FDeEMsQ0FBQyxDQUFDO0FBRUgsTUFBTSxZQUFZLEdBQUcsR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLEtBQUssQ0FBQztJQUN0QyxVQUFVLEVBQUUsR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUNwQyxJQUFJLEVBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLE9BQU8sRUFBRTtJQUNsRCxTQUFTLEVBQUUsR0FBRztTQUNYLE1BQU0sRUFBRTtTQUNSLFFBQVEsRUFBRTtTQUNWLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxD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
|
package/dist/loader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAQA,OAAO,EAA0B,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAQA,OAAO,EAA0B,QAAQ,EAAE,MAAM,aAAa,CAAC;AA6K/D,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,uBASrD;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,CASzD"}
|
package/dist/loader.js
CHANGED
|
@@ -16,7 +16,7 @@ const sfc_1 = require("./utils/sfc");
|
|
|
16
16
|
const fileUtils_1 = require("./utils/fileUtils");
|
|
17
17
|
const v3_1 = require("./utils/v3");
|
|
18
18
|
const IMPORTED_BLOCKS_DIR = '_imported';
|
|
19
|
-
let
|
|
19
|
+
let EXTERNAL_BLOCKS_CAHCE = new Map();
|
|
20
20
|
function isSfcBlock(block) {
|
|
21
21
|
return 'path' in block;
|
|
22
22
|
}
|
|
@@ -24,7 +24,8 @@ function getExternalBlockKey(block) {
|
|
|
24
24
|
const folder = isSfcBlock(block) ? block.path.folder : block.Folder;
|
|
25
25
|
const name = isSfcBlock(block) ? block.path.name : block.Name;
|
|
26
26
|
const blockTypeName = isSfcBlock(block) ? block.path.blockTypeName : block.Type;
|
|
27
|
-
|
|
27
|
+
const version = isSfcBlock(block) ? Number(block.metadata['version'] ?? 3) : 3;
|
|
28
|
+
return blockTypeName === 'settings' ? `${folder}/${name}.${blockTypeName}` : `mars${version}_${name}`;
|
|
28
29
|
}
|
|
29
30
|
function getImportedBlocksRoot() {
|
|
30
31
|
return path_1.default.join(configuration_1.config.blocksDir, IMPORTED_BLOCKS_DIR);
|
|
@@ -43,19 +44,18 @@ function isSettingsBlockFile(filePath) {
|
|
|
43
44
|
}
|
|
44
45
|
function rememberExternalBlocks(blocks) {
|
|
45
46
|
for (const block of blocks) {
|
|
46
|
-
|
|
47
|
+
const blockKey = getExternalBlockKey(block);
|
|
48
|
+
EXTERNAL_BLOCKS_CAHCE.set(blockKey, block);
|
|
47
49
|
}
|
|
48
50
|
}
|
|
49
51
|
function filterFreshExternalBlocks(blocks) {
|
|
50
|
-
const result =
|
|
51
|
-
for (const
|
|
52
|
-
const blockKey = getExternalBlockKey(
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
downloadedExternalBlockNames.add(blockKey);
|
|
56
|
-
result.push(block);
|
|
52
|
+
const result = new Map();
|
|
53
|
+
for (const sfcBlock of blocks) {
|
|
54
|
+
const blockKey = getExternalBlockKey(sfcBlock);
|
|
55
|
+
EXTERNAL_BLOCKS_CAHCE.set(blockKey, sfcBlock);
|
|
56
|
+
result.set(blockKey, sfcBlock);
|
|
57
57
|
}
|
|
58
|
-
return result;
|
|
58
|
+
return Array.from(result.values());
|
|
59
59
|
}
|
|
60
60
|
async function downloadFromExternal(externalImport) {
|
|
61
61
|
const params = { api_key: externalImport.api_key, git_commit_ish: externalImport.git_commit_ish || '' };
|
|
@@ -69,15 +69,14 @@ async function downloadFromExternal(externalImport) {
|
|
|
69
69
|
console.log(`${url} does not support V4, fallback to V3`);
|
|
70
70
|
}
|
|
71
71
|
const v3Resp = await axios_1.default.get(`${url}/api/GetExportedAppBlocks`, { params });
|
|
72
|
-
const v3Blocks =
|
|
72
|
+
const v3Blocks = new Map();
|
|
73
73
|
for (const block of v3Resp.data) {
|
|
74
74
|
const blockKey = getExternalBlockKey(block);
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
v3Blocks.push((0, v3_1.convertV3ToSfc)(block));
|
|
75
|
+
const sfcBlock = (0, v3_1.convertV3ToSfc)(block);
|
|
76
|
+
v3Blocks.set(blockKey, sfcBlock);
|
|
77
|
+
EXTERNAL_BLOCKS_CAHCE.set(blockKey, sfcBlock);
|
|
79
78
|
}
|
|
80
|
-
return { commit: '', hash: '', blocks: v3Blocks };
|
|
79
|
+
return { commit: '', hash: '', blocks: Array.from(v3Blocks.values()) };
|
|
81
80
|
}
|
|
82
81
|
async function saveImportedBlocks(externalImport, blocks) {
|
|
83
82
|
const importedProjectDir = getImportedProjectDir(externalImport);
|
|
@@ -117,38 +116,37 @@ async function downloadAndSave(externalImport) {
|
|
|
117
116
|
return blocks;
|
|
118
117
|
}
|
|
119
118
|
async function downloadAll(externalImports) {
|
|
120
|
-
|
|
119
|
+
EXTERNAL_BLOCKS_CAHCE = new Map();
|
|
121
120
|
const responses = await Promise.all(externalImports.map(downloadAndSave));
|
|
122
121
|
return lodash_1.default.flatten(responses);
|
|
123
122
|
}
|
|
124
|
-
async function
|
|
123
|
+
async function removeAllLocalSettingsBlocks() {
|
|
124
|
+
const files = await (0, fileUtils_1.listFilesRecursive)(configuration_1.config.blocksDir);
|
|
125
|
+
const settingsFiles = files.filter(filePath => !isImportedBlockFile(filePath)).filter(isSettingsBlockFile);
|
|
126
|
+
await Promise.all(settingsFiles.map(filePath => fs_1.promises.rm(filePath, { force: true })));
|
|
127
|
+
}
|
|
128
|
+
async function saveSettingsBlocks() {
|
|
125
129
|
console.log('Downloading settings from MongoDB');
|
|
126
130
|
const mongoConn = await new mongodb_1.MongoClient(configuration_1.config.mongoConn).connect();
|
|
127
131
|
try {
|
|
132
|
+
await removeAllLocalSettingsBlocks();
|
|
128
133
|
const db = mongoConn.db(configuration_1.config.mongoDbName);
|
|
129
|
-
const settingsBlocks =
|
|
130
|
-
.collection('blocks')
|
|
131
|
-
.find({
|
|
134
|
+
const settingsBlocks = db.collection('blocks').find({
|
|
132
135
|
Type: 'settings',
|
|
133
|
-
})
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
136
|
+
});
|
|
137
|
+
let downloadedCount = 0;
|
|
138
|
+
for await (const block of settingsBlocks) {
|
|
139
|
+
const serialized = (0, sfc_1.serializeSfc)((0, v3_1.convertV3ToSfc)(block));
|
|
140
|
+
const outputPath = path_1.default.join(configuration_1.config.blocksDir, serialized.filePath);
|
|
141
|
+
await (0, fileUtils_1.writeFileMakeDir)(outputPath, serialized.content);
|
|
142
|
+
downloadedCount += 1;
|
|
143
|
+
}
|
|
144
|
+
console.log(`Downloaded ${downloadedCount} settings block(s) from MongoDB`);
|
|
137
145
|
}
|
|
138
146
|
finally {
|
|
139
147
|
await mongoConn.close();
|
|
140
148
|
}
|
|
141
149
|
}
|
|
142
|
-
async function saveSettingsBlocks(blocks) {
|
|
143
|
-
if (configuration_1.config.production) {
|
|
144
|
-
return;
|
|
145
|
-
}
|
|
146
|
-
for (const block of blocks) {
|
|
147
|
-
const serialized = (0, sfc_1.serializeSfc)(block);
|
|
148
|
-
const outputPath = path_1.default.join(configuration_1.config.blocksDir, serialized.filePath);
|
|
149
|
-
await (0, fileUtils_1.writeFileMakeDir)(outputPath, serialized.content);
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
150
|
async function readBlockFile(blocksDir, filePath) {
|
|
153
151
|
const content = await fs_1.promises.readFile(filePath);
|
|
154
152
|
const relPath = path_1.default.relative(blocksDir, filePath);
|
|
@@ -165,9 +163,11 @@ async function readBlockFiles(blocksDir) {
|
|
|
165
163
|
exports.readBlockFiles = readBlockFiles;
|
|
166
164
|
async function loadAllBlocks() {
|
|
167
165
|
const externalBlocks = await downloadAll(configuration_1.config.importProjects);
|
|
168
|
-
|
|
166
|
+
if (!configuration_1.config.production && configuration_1.config.saveImportedBlocks) {
|
|
167
|
+
await saveSettingsBlocks();
|
|
168
|
+
}
|
|
169
169
|
const localBlocks = await readBlockFiles(configuration_1.config.blocksDir);
|
|
170
170
|
return [...externalBlocks, ...localBlocks];
|
|
171
171
|
}
|
|
172
172
|
exports.loadAllBlocks = loadAllBlocks;
|
|
173
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
173
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/configuration.ts
CHANGED
|
@@ -56,8 +56,8 @@ const ConfigSchema = yup.object().shape({
|
|
|
56
56
|
.string()
|
|
57
57
|
.required()
|
|
58
58
|
.transform(v => path.resolve(v)),
|
|
59
|
-
compileCache: yup.boolean().
|
|
60
|
-
saveImportedBlocks: yup.boolean().
|
|
59
|
+
compileCache: yup.boolean().required(),
|
|
60
|
+
saveImportedBlocks: yup.boolean().required(),
|
|
61
61
|
mongoConn: yup.string().required(),
|
|
62
62
|
mongoDbName: yup.string().required(),
|
|
63
63
|
azureStorageConnection: yup.string().required(),
|
package/src/loader.ts
CHANGED
|
@@ -12,7 +12,7 @@ import { convertV3ToSfc, V3MongoBlock } from './utils/v3';
|
|
|
12
12
|
|
|
13
13
|
type V4Response = { commit: string; hash: string; blocks: SfcBlock[] };
|
|
14
14
|
const IMPORTED_BLOCKS_DIR = '_imported';
|
|
15
|
-
let
|
|
15
|
+
let EXTERNAL_BLOCKS_CAHCE = new Map<string, SfcBlock>();
|
|
16
16
|
|
|
17
17
|
function isSfcBlock(block: SfcBlock | V3MongoBlock): block is SfcBlock {
|
|
18
18
|
return 'path' in block;
|
|
@@ -22,7 +22,8 @@ function getExternalBlockKey(block: SfcBlock | V3MongoBlock) {
|
|
|
22
22
|
const folder = isSfcBlock(block) ? block.path.folder : block.Folder;
|
|
23
23
|
const name = isSfcBlock(block) ? block.path.name : block.Name;
|
|
24
24
|
const blockTypeName = isSfcBlock(block) ? block.path.blockTypeName : block.Type;
|
|
25
|
-
|
|
25
|
+
const version = isSfcBlock(block) ? Number(block.metadata['version'] ?? 3) : 3;
|
|
26
|
+
return blockTypeName === 'settings' ? `${folder}/${name}.${blockTypeName}` : `mars${version}_${name}`;
|
|
26
27
|
}
|
|
27
28
|
|
|
28
29
|
function getImportedBlocksRoot() {
|
|
@@ -46,22 +47,22 @@ function isSettingsBlockFile(filePath: string) {
|
|
|
46
47
|
|
|
47
48
|
function rememberExternalBlocks(blocks: SfcBlock[]) {
|
|
48
49
|
for (const block of blocks) {
|
|
49
|
-
|
|
50
|
+
const blockKey = getExternalBlockKey(block);
|
|
51
|
+
EXTERNAL_BLOCKS_CAHCE.set(blockKey, block);
|
|
50
52
|
}
|
|
51
53
|
}
|
|
52
54
|
|
|
53
55
|
function filterFreshExternalBlocks(blocks: SfcBlock[]) {
|
|
54
|
-
const result
|
|
56
|
+
const result = new Map<string, SfcBlock>();
|
|
55
57
|
|
|
56
|
-
for (const
|
|
57
|
-
const blockKey = getExternalBlockKey(
|
|
58
|
-
if (downloadedExternalBlockNames.has(blockKey)) continue;
|
|
58
|
+
for (const sfcBlock of blocks) {
|
|
59
|
+
const blockKey = getExternalBlockKey(sfcBlock);
|
|
59
60
|
|
|
60
|
-
|
|
61
|
-
result.
|
|
61
|
+
EXTERNAL_BLOCKS_CAHCE.set(blockKey, sfcBlock);
|
|
62
|
+
result.set(blockKey, sfcBlock);
|
|
62
63
|
}
|
|
63
64
|
|
|
64
|
-
return result;
|
|
65
|
+
return Array.from(result.values());
|
|
65
66
|
}
|
|
66
67
|
|
|
67
68
|
async function downloadFromExternal(externalImport: ImportProjectConfig): Promise<V4Response> {
|
|
@@ -77,17 +78,17 @@ async function downloadFromExternal(externalImport: ImportProjectConfig): Promis
|
|
|
77
78
|
}
|
|
78
79
|
|
|
79
80
|
const v3Resp = await axios.get<V3MongoBlock[]>(`${url}/api/GetExportedAppBlocks`, { params });
|
|
80
|
-
const v3Blocks
|
|
81
|
+
const v3Blocks = new Map<string, SfcBlock>();
|
|
81
82
|
|
|
82
83
|
for (const block of v3Resp.data) {
|
|
83
84
|
const blockKey = getExternalBlockKey(block);
|
|
84
|
-
|
|
85
|
+
const sfcBlock = convertV3ToSfc(block);
|
|
85
86
|
|
|
86
|
-
|
|
87
|
-
|
|
87
|
+
v3Blocks.set(blockKey, sfcBlock);
|
|
88
|
+
EXTERNAL_BLOCKS_CAHCE.set(blockKey, sfcBlock);
|
|
88
89
|
}
|
|
89
90
|
|
|
90
|
-
return { commit: '', hash: '', blocks: v3Blocks };
|
|
91
|
+
return { commit: '', hash: '', blocks: Array.from(v3Blocks.values()) };
|
|
91
92
|
}
|
|
92
93
|
|
|
93
94
|
async function saveImportedBlocks(externalImport: ImportProjectConfig, blocks: SfcBlock[]) {
|
|
@@ -134,43 +135,44 @@ async function downloadAndSave(externalImport: ImportProjectConfig): Promise<Sfc
|
|
|
134
135
|
}
|
|
135
136
|
|
|
136
137
|
async function downloadAll(externalImports: ImportProjectConfig[]) {
|
|
137
|
-
|
|
138
|
+
EXTERNAL_BLOCKS_CAHCE = new Map<string, SfcBlock>();
|
|
138
139
|
const responses = await Promise.all(externalImports.map(downloadAndSave));
|
|
139
140
|
return _.flatten(responses);
|
|
140
141
|
}
|
|
141
142
|
|
|
142
|
-
async function
|
|
143
|
+
async function removeAllLocalSettingsBlocks() {
|
|
144
|
+
const files = await listFilesRecursive(config.blocksDir);
|
|
145
|
+
const settingsFiles = files.filter(filePath => !isImportedBlockFile(filePath)).filter(isSettingsBlockFile);
|
|
146
|
+
|
|
147
|
+
await Promise.all(settingsFiles.map(filePath => fs.rm(filePath, { force: true })));
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
async function saveSettingsBlocks() {
|
|
143
151
|
console.log('Downloading settings from MongoDB');
|
|
144
152
|
const mongoConn = await new MongoClient(config.mongoConn).connect();
|
|
145
153
|
|
|
146
154
|
try {
|
|
155
|
+
await removeAllLocalSettingsBlocks();
|
|
156
|
+
|
|
147
157
|
const db = mongoConn.db(config.mongoDbName);
|
|
148
|
-
const settingsBlocks =
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
158
|
+
const settingsBlocks = db.collection<V3MongoBlock>('blocks').find({
|
|
159
|
+
Type: 'settings',
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
let downloadedCount = 0;
|
|
163
|
+
for await (const block of settingsBlocks) {
|
|
164
|
+
const serialized = serializeSfc(convertV3ToSfc(block));
|
|
165
|
+
const outputPath = path.join(config.blocksDir, serialized.filePath);
|
|
166
|
+
await writeFileMakeDir(outputPath, serialized.content);
|
|
167
|
+
downloadedCount += 1;
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
console.log(`Downloaded ${downloadedCount} settings block(s) from MongoDB`);
|
|
157
171
|
} finally {
|
|
158
172
|
await mongoConn.close();
|
|
159
173
|
}
|
|
160
174
|
}
|
|
161
175
|
|
|
162
|
-
async function saveSettingsBlocks(blocks: SfcBlock[]) {
|
|
163
|
-
if (config.production) {
|
|
164
|
-
return;
|
|
165
|
-
}
|
|
166
|
-
|
|
167
|
-
for (const block of blocks) {
|
|
168
|
-
const serialized = serializeSfc(block);
|
|
169
|
-
const outputPath = path.join(config.blocksDir, serialized.filePath);
|
|
170
|
-
await writeFileMakeDir(outputPath, serialized.content);
|
|
171
|
-
}
|
|
172
|
-
}
|
|
173
|
-
|
|
174
176
|
async function readBlockFile(blocksDir: string, filePath: string): Promise<SfcBlock> {
|
|
175
177
|
const content = await fs.readFile(filePath);
|
|
176
178
|
const relPath = path.relative(blocksDir, filePath);
|
|
@@ -190,7 +192,11 @@ export async function readBlockFiles(blocksDir: string) {
|
|
|
190
192
|
|
|
191
193
|
export async function loadAllBlocks(): Promise<SfcBlock[]> {
|
|
192
194
|
const externalBlocks = await downloadAll(config.importProjects);
|
|
193
|
-
|
|
195
|
+
|
|
196
|
+
if (!config.production && config.saveImportedBlocks) {
|
|
197
|
+
await saveSettingsBlocks();
|
|
198
|
+
}
|
|
199
|
+
|
|
194
200
|
const localBlocks = await readBlockFiles(config.blocksDir);
|
|
195
201
|
return [...externalBlocks, ...localBlocks];
|
|
196
202
|
}
|