@marsx-dev/launcher 0.0.25 → 0.0.28
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/loader.d.ts.map +1 -1
- package/dist/loader.js +55 -7
- package/package.json +1 -1
- package/src/loader.ts +65 -7
package/dist/loader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAQA,OAAO,EAA0B,QAAQ,EAAE,MAAM,aAAa,CAAC;AA4J/D,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,uBASrD;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,CAKzD"}
|
package/dist/loader.js
CHANGED
|
@@ -5,7 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.loadAllBlocks = exports.readBlockFiles = void 0;
|
|
7
7
|
const axios_1 = __importDefault(require("axios"));
|
|
8
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
8
9
|
const fs_1 = require("fs");
|
|
10
|
+
const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
|
|
9
11
|
const mongodb_1 = require("mongodb");
|
|
10
12
|
const lodash_1 = __importDefault(require("lodash"));
|
|
11
13
|
const path_1 = __importDefault(require("path"));
|
|
@@ -14,6 +16,7 @@ const sfc_1 = require("./utils/sfc");
|
|
|
14
16
|
const fileUtils_1 = require("./utils/fileUtils");
|
|
15
17
|
const v3_1 = require("./utils/v3");
|
|
16
18
|
const IMPORTED_BLOCKS_DIR = '_imported';
|
|
19
|
+
let downloadedExternalBlockNames = new Set();
|
|
17
20
|
function getImportedBlocksRoot() {
|
|
18
21
|
return path_1.default.join(configuration_1.config.blocksDir, IMPORTED_BLOCKS_DIR);
|
|
19
22
|
}
|
|
@@ -29,19 +32,41 @@ function isImportedBlockFile(filePath) {
|
|
|
29
32
|
function isSettingsBlockFile(filePath) {
|
|
30
33
|
return path_1.default.parse(filePath).name.endsWith('.settings');
|
|
31
34
|
}
|
|
35
|
+
function rememberExternalBlocks(blocks) {
|
|
36
|
+
for (const block of blocks) {
|
|
37
|
+
downloadedExternalBlockNames.add(block.path.name);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
function filterFreshExternalBlocks(blocks) {
|
|
41
|
+
const result = [];
|
|
42
|
+
for (const block of blocks) {
|
|
43
|
+
if (downloadedExternalBlockNames.has(block.path.name))
|
|
44
|
+
continue;
|
|
45
|
+
downloadedExternalBlockNames.add(block.path.name);
|
|
46
|
+
result.push(block);
|
|
47
|
+
}
|
|
48
|
+
return result;
|
|
49
|
+
}
|
|
32
50
|
async function downloadFromExternal(externalImport) {
|
|
33
51
|
const params = { api_key: externalImport.api_key, git_commit_ish: externalImport.git_commit_ish || '' };
|
|
34
52
|
const url = lodash_1.default.trimEnd(externalImport.url, '/');
|
|
35
53
|
console.log(`Downloading blocks from ${url}`);
|
|
36
54
|
try {
|
|
37
55
|
const v4Resp = await axios_1.default.get(`${url}/api/GetExportedAppBlocksV4`, { params });
|
|
38
|
-
return v4Resp.data;
|
|
56
|
+
return { ...v4Resp.data, blocks: filterFreshExternalBlocks(v4Resp.data.blocks) };
|
|
39
57
|
}
|
|
40
58
|
catch (e) {
|
|
41
59
|
console.log(`${url} does not support V4, fallback to V3`);
|
|
42
60
|
}
|
|
43
61
|
const v3Resp = await axios_1.default.get(`${url}/api/GetExportedAppBlocks`, { params });
|
|
44
|
-
|
|
62
|
+
const v3Blocks = [];
|
|
63
|
+
for (const block of v3Resp.data.reverse()) {
|
|
64
|
+
if (downloadedExternalBlockNames.has(block.Name))
|
|
65
|
+
continue;
|
|
66
|
+
downloadedExternalBlockNames.add(block.Name);
|
|
67
|
+
v3Blocks.push((0, v3_1.convertV3ToSfc)(block));
|
|
68
|
+
}
|
|
69
|
+
return { commit: '', hash: '', blocks: v3Blocks };
|
|
45
70
|
}
|
|
46
71
|
async function saveImportedBlocks(externalImport, blocks) {
|
|
47
72
|
const importedProjectDir = getImportedProjectDir(externalImport);
|
|
@@ -53,14 +78,34 @@ async function saveImportedBlocks(externalImport, blocks) {
|
|
|
53
78
|
await (0, fileUtils_1.writeFileMakeDir)(outputPath, serialized.content);
|
|
54
79
|
}
|
|
55
80
|
}
|
|
81
|
+
function getImportCacheFilePath(externalImport) {
|
|
82
|
+
const hash = crypto_1.default.createHash('md5').update((0, json_stable_stringify_1.default)(externalImport)).digest('hex');
|
|
83
|
+
const cacheFileName = `${externalImport.name}_${externalImport.git_commit_ish}_${hash}.json`.replace(/[^\w.]+/g, '_');
|
|
84
|
+
return path_1.default.join(configuration_1.config.cacheDir, 'imports', cacheFileName);
|
|
85
|
+
}
|
|
56
86
|
async function downloadAndSave(externalImport) {
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
await
|
|
87
|
+
const cacheFilePath = getImportCacheFilePath(externalImport);
|
|
88
|
+
let blocks = [];
|
|
89
|
+
if (await (0, fileUtils_1.isFile)(cacheFilePath)) {
|
|
90
|
+
const content = await fs_1.promises.readFile(cacheFilePath, 'utf-8');
|
|
91
|
+
blocks = JSON.parse(content);
|
|
92
|
+
console.log(`Loaded ${blocks.length} cached blocks from ${externalImport.url}`);
|
|
93
|
+
rememberExternalBlocks(blocks);
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
const response = await downloadFromExternal(externalImport);
|
|
97
|
+
blocks = response.blocks;
|
|
98
|
+
console.log(`Downloaded ${blocks.length} blocks from ${externalImport.url}`);
|
|
99
|
+
await (0, fileUtils_1.writeFileMakeDir)(cacheFilePath, JSON.stringify(blocks, null, 2), 'utf-8');
|
|
100
|
+
}
|
|
101
|
+
if (!configuration_1.config.production) {
|
|
102
|
+
await saveImportedBlocks(externalImport, blocks);
|
|
103
|
+
}
|
|
60
104
|
return blocks;
|
|
61
105
|
}
|
|
62
106
|
async function downloadAll(externalImports) {
|
|
63
|
-
|
|
107
|
+
downloadedExternalBlockNames = new Set();
|
|
108
|
+
const responses = await Promise.all([...externalImports].reverse().map(downloadAndSave));
|
|
64
109
|
return lodash_1.default.flatten(responses);
|
|
65
110
|
}
|
|
66
111
|
async function downloadSettingsFromDb() {
|
|
@@ -82,6 +127,9 @@ async function downloadSettingsFromDb() {
|
|
|
82
127
|
}
|
|
83
128
|
}
|
|
84
129
|
async function saveSettingsBlocks(blocks) {
|
|
130
|
+
if (configuration_1.config.production) {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
85
133
|
for (const block of blocks) {
|
|
86
134
|
const serialized = (0, sfc_1.serializeSfc)(block);
|
|
87
135
|
const outputPath = path_1.default.join(configuration_1.config.blocksDir, serialized.filePath);
|
|
@@ -109,4 +157,4 @@ async function loadAllBlocks() {
|
|
|
109
157
|
return [...externalBlocks, ...localBlocks];
|
|
110
158
|
}
|
|
111
159
|
exports.loadAllBlocks = loadAllBlocks;
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
160
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAA4B;AAC5B,2BAAoC;AACpC,kFAA8C;AAC9C,qCAAsC;AACtC,oDAAuB;AACvB,gDAAwB;AACxB,mDAA8D;AAC9D,qCAA+D;AAC/D,iDAAiF;AACjF,mCAA0D;AAG1D,MAAM,mBAAmB,GAAG,WAAW,CAAC;AACxC,IAAI,4BAA4B,GAAG,IAAI,GAAG,EAAU,CAAC;AAErD,SAAS,qBAAqB;IAC5B,OAAO,cAAI,CAAC,IAAI,CAAC,sBAAM,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,qBAAqB,CAAC,cAAmC;IAChE,OAAO,cAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAgB;IAC3C,MAAM,kBAAkB,GAAG,qBAAqB,EAAE,CAAC;IACnD,MAAM,gBAAgB,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,oBAAoB,GAAG,cAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC9D,OAAO,gBAAgB,KAAK,oBAAoB,IAAI,gBAAgB,CAAC,UAAU,CAAC,GAAG,oBAAoB,GAAG,cAAI,CAAC,GAAG,EAAE,CAAC,CAAC;AACxH,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAgB;IAC3C,OAAO,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,sBAAsB,CAAC,MAAkB;IAChD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,4BAA4B,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACnD;AACH,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAkB;IACnD,MAAM,MAAM,GAAe,EAAE,CAAC;IAE9B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,4BAA4B,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,SAAS;QAEhE,4BAA4B,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACpB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,cAAmC;IACrE,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO,EAAE,cAAc,EAAE,cAAc,CAAC,cAAc,IAAI,EAAE,EAAE,CAAC;IAExG,MAAM,GAAG,GAAG,gBAAC,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAC;IAC9C,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,eAAK,CAAC,GAAG,CAAa,GAAG,GAAG,6BAA6B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAC5F,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,yBAAyB,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;KAClF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,sCAAsC,CAAC,CAAC;KAC3D;IAED,MAAM,MAAM,GAAG,MAAM,eAAK,CAAC,GAAG,CAAiB,GAAG,GAAG,2BAA2B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9F,MAAM,QAAQ,GAAe,EAAE,CAAC;IAEhC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE;QACzC,IAAI,4BAA4B,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,SAAS;QAE3D,4BAA4B,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7C,QAAQ,CAAC,IAAI,CAAC,IAAA,mBAAc,EAAC,KAAK,CAAC,CAAC,CAAC;KACtC;IAED,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AACpD,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,cAAmC,EAAE,MAAkB;IACvF,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,cAAc,CAAC,CAAC;IACjE,MAAM,aAAE,CAAC,EAAE,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClE,MAAM,aAAE,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAExD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,MAAM,UAAU,GAAG,IAAA,kBAAY,EAAC,KAAK,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtE,MAAM,IAAA,4BAAgB,EAAC,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;KACxD;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,cAAmC;IACjE,MAAM,IAAI,GAAG,gBAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAA,+BAAS,EAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtF,MAAM,aAAa,GAAG,GAAG,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,cAAc,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IACtH,OAAO,cAAI,CAAC,IAAI,CAAC,sBAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AAC9D,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,cAAmC;IAChE,MAAM,aAAa,GAAG,sBAAsB,CAAC,cAAc,CAAC,CAAC;IAC7D,IAAI,MAAM,GAAe,EAAE,CAAC;IAE5B,IAAI,MAAM,IAAA,kBAAM,EAAC,aAAa,CAAC,EAAE;QAC/B,MAAM,OAAO,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAC1D,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAe,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM,CAAC,MAAM,uBAAuB,cAAc,CAAC,GAAG,EAAE,CAAC,CAAC;QAChF,sBAAsB,CAAC,MAAM,CAAC,CAAC;KAChC;SAAM;QACL,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,cAAc,CAAC,CAAC;QAC5D,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,cAAc,MAAM,CAAC,MAAM,gBAAgB,cAAc,CAAC,GAAG,EAAE,CAAC,CAAC;QAC7E,MAAM,IAAA,4BAAgB,EAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;KACjF;IAED,IAAI,CAAC,sBAAM,CAAC,UAAU,EAAE;QACtB,MAAM,kBAAkB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;KAClD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,eAAsC;IAC/D,4BAA4B,GAAG,IAAI,GAAG,EAAU,CAAC;IACjD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC;IACzF,OAAO,gBAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AAC9B,CAAC;AAED,KAAK,UAAU,sBAAsB;IACnC,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,MAAM,IAAI,qBAAW,CAAC,sBAAM,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;IAEpE,IAAI;QACF,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,sBAAM,CAAC,WAAW,CAAC,CAAC;QAC5C,MAAM,cAAc,GAAG,MAAM,EAAE;aAC5B,UAAU,CAAe,QAAQ,CAAC;aAClC,IAAI,CAAC;YACJ,IAAI,EAAE,UAAU;SACjB,CAAC;aACD,OAAO,EAAE,CAAC;QAEb,OAAO,CAAC,GAAG,CAAC,cAAc,cAAc,CAAC,MAAM,iCAAiC,CAAC,CAAC;QAClF,OAAO,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAA,mBAAc,EAAC,KAAK,CAAC,CAAC,CAAC;KAC3D;YAAS;QACR,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;KACzB;AACH,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,MAAkB;IAClD,IAAI,sBAAM,CAAC,UAAU,EAAE;QACrB,OAAO;KACR;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,MAAM,UAAU,GAAG,IAAA,kBAAY,EAAC,KAAK,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,sBAAM,CAAC,SAAS,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QACpE,MAAM,IAAA,4BAAgB,EAAC,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;KACxD;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,SAAiB,EAAE,QAAgB;IAC9D,MAAM,OAAO,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,cAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACnD,OAAO,IAAA,cAAQ,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,SAAiB;IACpD,MAAM,KAAK,GAAG,MAAM,IAAA,8BAAkB,EAAC,SAAS,CAAC,CAAC;IAClD,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,KAAK;SACF,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,cAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;SAC9C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;SACpC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;SACpC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CACzC,CAAC;AACJ,CAAC;AATD,wCASC;AAEM,KAAK,UAAU,aAAa;IACjC,MAAM,cAAc,GAAG,MAAM,WAAW,CAAC,sBAAM,CAAC,cAAc,CAAC,CAAC;IAChE,MAAM,kBAAkB,CAAC,MAAM,sBAAsB,EAAE,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,sBAAM,CAAC,SAAS,CAAC,CAAC;IAC3D,OAAO,CAAC,GAAG,cAAc,EAAE,GAAG,WAAW,CAAC,CAAC;AAC7C,CAAC;AALD,sCAKC"}
|
package/package.json
CHANGED
package/src/loader.ts
CHANGED
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import axios from 'axios';
|
|
2
|
+
import crypto from 'crypto';
|
|
2
3
|
import { promises as fs } from 'fs';
|
|
4
|
+
import stringify from 'json-stable-stringify';
|
|
3
5
|
import { MongoClient } from 'mongodb';
|
|
4
6
|
import _ from 'lodash';
|
|
5
7
|
import path from 'path';
|
|
6
8
|
import { config, ImportProjectConfig } from './configuration';
|
|
7
9
|
import { parseSFC, serializeSfc, SfcBlock } from './utils/sfc';
|
|
8
|
-
import { listFilesRecursive, writeFileMakeDir } from './utils/fileUtils';
|
|
10
|
+
import { isFile, listFilesRecursive, writeFileMakeDir } from './utils/fileUtils';
|
|
9
11
|
import { convertV3ToSfc, V3MongoBlock } from './utils/v3';
|
|
10
12
|
|
|
11
13
|
type V4Response = { commit: string; hash: string; blocks: SfcBlock[] };
|
|
12
14
|
const IMPORTED_BLOCKS_DIR = '_imported';
|
|
15
|
+
let downloadedExternalBlockNames = new Set<string>();
|
|
13
16
|
|
|
14
17
|
function getImportedBlocksRoot() {
|
|
15
18
|
return path.join(config.blocksDir, IMPORTED_BLOCKS_DIR);
|
|
@@ -30,6 +33,25 @@ function isSettingsBlockFile(filePath: string) {
|
|
|
30
33
|
return path.parse(filePath).name.endsWith('.settings');
|
|
31
34
|
}
|
|
32
35
|
|
|
36
|
+
function rememberExternalBlocks(blocks: SfcBlock[]) {
|
|
37
|
+
for (const block of blocks) {
|
|
38
|
+
downloadedExternalBlockNames.add(block.path.name);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function filterFreshExternalBlocks(blocks: SfcBlock[]) {
|
|
43
|
+
const result: SfcBlock[] = [];
|
|
44
|
+
|
|
45
|
+
for (const block of blocks) {
|
|
46
|
+
if (downloadedExternalBlockNames.has(block.path.name)) continue;
|
|
47
|
+
|
|
48
|
+
downloadedExternalBlockNames.add(block.path.name);
|
|
49
|
+
result.push(block);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
return result;
|
|
53
|
+
}
|
|
54
|
+
|
|
33
55
|
async function downloadFromExternal(externalImport: ImportProjectConfig): Promise<V4Response> {
|
|
34
56
|
const params = { api_key: externalImport.api_key, git_commit_ish: externalImport.git_commit_ish || '' };
|
|
35
57
|
|
|
@@ -37,13 +59,22 @@ async function downloadFromExternal(externalImport: ImportProjectConfig): Promis
|
|
|
37
59
|
console.log(`Downloading blocks from ${url}`);
|
|
38
60
|
try {
|
|
39
61
|
const v4Resp = await axios.get<V4Response>(`${url}/api/GetExportedAppBlocksV4`, { params });
|
|
40
|
-
return v4Resp.data;
|
|
62
|
+
return { ...v4Resp.data, blocks: filterFreshExternalBlocks(v4Resp.data.blocks) };
|
|
41
63
|
} catch (e) {
|
|
42
64
|
console.log(`${url} does not support V4, fallback to V3`);
|
|
43
65
|
}
|
|
44
66
|
|
|
45
67
|
const v3Resp = await axios.get<V3MongoBlock[]>(`${url}/api/GetExportedAppBlocks`, { params });
|
|
46
|
-
|
|
68
|
+
const v3Blocks: SfcBlock[] = [];
|
|
69
|
+
|
|
70
|
+
for (const block of v3Resp.data.reverse()) {
|
|
71
|
+
if (downloadedExternalBlockNames.has(block.Name)) continue;
|
|
72
|
+
|
|
73
|
+
downloadedExternalBlockNames.add(block.Name);
|
|
74
|
+
v3Blocks.push(convertV3ToSfc(block));
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
return { commit: '', hash: '', blocks: v3Blocks };
|
|
47
78
|
}
|
|
48
79
|
|
|
49
80
|
async function saveImportedBlocks(externalImport: ImportProjectConfig, blocks: SfcBlock[]) {
|
|
@@ -58,15 +89,38 @@ async function saveImportedBlocks(externalImport: ImportProjectConfig, blocks: S
|
|
|
58
89
|
}
|
|
59
90
|
}
|
|
60
91
|
|
|
92
|
+
function getImportCacheFilePath(externalImport: ImportProjectConfig) {
|
|
93
|
+
const hash = crypto.createHash('md5').update(stringify(externalImport)).digest('hex');
|
|
94
|
+
const cacheFileName = `${externalImport.name}_${externalImport.git_commit_ish}_${hash}.json`.replace(/[^\w.]+/g, '_');
|
|
95
|
+
return path.join(config.cacheDir, 'imports', cacheFileName);
|
|
96
|
+
}
|
|
97
|
+
|
|
61
98
|
async function downloadAndSave(externalImport: ImportProjectConfig): Promise<SfcBlock[]> {
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
99
|
+
const cacheFilePath = getImportCacheFilePath(externalImport);
|
|
100
|
+
let blocks: SfcBlock[] = [];
|
|
101
|
+
|
|
102
|
+
if (await isFile(cacheFilePath)) {
|
|
103
|
+
const content = await fs.readFile(cacheFilePath, 'utf-8');
|
|
104
|
+
blocks = JSON.parse(content) as SfcBlock[];
|
|
105
|
+
console.log(`Loaded ${blocks.length} cached blocks from ${externalImport.url}`);
|
|
106
|
+
rememberExternalBlocks(blocks);
|
|
107
|
+
} else {
|
|
108
|
+
const response = await downloadFromExternal(externalImport);
|
|
109
|
+
blocks = response.blocks;
|
|
110
|
+
console.log(`Downloaded ${blocks.length} blocks from ${externalImport.url}`);
|
|
111
|
+
await writeFileMakeDir(cacheFilePath, JSON.stringify(blocks, null, 2), 'utf-8');
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
if (!config.production) {
|
|
115
|
+
await saveImportedBlocks(externalImport, blocks);
|
|
116
|
+
}
|
|
117
|
+
|
|
65
118
|
return blocks;
|
|
66
119
|
}
|
|
67
120
|
|
|
68
121
|
async function downloadAll(externalImports: ImportProjectConfig[]) {
|
|
69
|
-
|
|
122
|
+
downloadedExternalBlockNames = new Set<string>();
|
|
123
|
+
const responses = await Promise.all([...externalImports].reverse().map(downloadAndSave));
|
|
70
124
|
return _.flatten(responses);
|
|
71
125
|
}
|
|
72
126
|
|
|
@@ -91,6 +145,10 @@ async function downloadSettingsFromDb(): Promise<SfcBlock[]> {
|
|
|
91
145
|
}
|
|
92
146
|
|
|
93
147
|
async function saveSettingsBlocks(blocks: SfcBlock[]) {
|
|
148
|
+
if (config.production) {
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
151
|
+
|
|
94
152
|
for (const block of blocks) {
|
|
95
153
|
const serialized = serializeSfc(block);
|
|
96
154
|
const outputPath = path.join(config.blocksDir, serialized.filePath);
|