@marsx-dev/launcher 0.0.26 → 0.0.28

package/dist/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAQA,OAAO,EAA0B,QAAQ,EAAE,MAAM,aAAa,CAAC;AAuI/D,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,uBASrD;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,CAKzD"}
+{"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

@@ -16,6 +16,7 @@ const sfc_1 = require("./utils/sfc");
 const fileUtils_1 = require("./utils/fileUtils");
 const v3_1 = require("./utils/v3");
 const IMPORTED_BLOCKS_DIR = '_imported';
+let downloadedExternalBlockNames = new Set();
 function getImportedBlocksRoot() {
     return path_1.default.join(configuration_1.config.blocksDir, IMPORTED_BLOCKS_DIR);
 }
@@ -31,25 +32,38 @@ function isImportedBlockFile(filePath) {
 function isSettingsBlockFile(filePath) {
     return path_1.default.parse(filePath).name.endsWith('.settings');
 }
+function rememberExternalBlocks(blocks) {
+    for (const block of blocks) {
+        downloadedExternalBlockNames.add(block.path.name);
+    }
+}
+function filterFreshExternalBlocks(blocks) {
+    const result = [];
+    for (const block of blocks) {
+        if (downloadedExternalBlockNames.has(block.path.name))
+            continue;
+        downloadedExternalBlockNames.add(block.path.name);
+        result.push(block);
+    }
+    return result;
+}
 async function downloadFromExternal(externalImport) {
     const params = { api_key: externalImport.api_key, git_commit_ish: externalImport.git_commit_ish || '' };
     const url = lodash_1.default.trimEnd(externalImport.url, '/');
     console.log(`Downloading blocks from ${url}`);
     try {
         const v4Resp = await axios_1.default.get(`${url}/api/GetExportedAppBlocksV4`, { params });
-        return v4Resp.data;
+        return { ...v4Resp.data, blocks: filterFreshExternalBlocks(v4Resp.data.blocks) };
     }
     catch (e) {
         console.log(`${url} does not support V4, fallback to V3`);
     }
     const v3Resp = await axios_1.default.get(`${url}/api/GetExportedAppBlocks`, { params });
-    const v3BlocksAllRaw = v3Resp.data.reverse();
-    const seenNames = new Set();
     const v3Blocks = [];
-    for (const block of v3BlocksAllRaw) {
-        if (seenNames.has(block.Name))
+    for (const block of v3Resp.data.reverse()) {
+        if (downloadedExternalBlockNames.has(block.Name))
             continue;
-        seenNames.add(block.Name);
+        downloadedExternalBlockNames.add(block.Name);
         v3Blocks.push((0, v3_1.convertV3ToSfc)(block));
     }
     return { commit: '', hash: '', blocks: v3Blocks };
@@ -71,22 +85,27 @@ function getImportCacheFilePath(externalImport) {
 }
 async function downloadAndSave(externalImport) {
     const cacheFilePath = getImportCacheFilePath(externalImport);
+    let blocks = [];
     if (await (0, fileUtils_1.isFile)(cacheFilePath)) {
         const content = await fs_1.promises.readFile(cacheFilePath, 'utf-8');
-        console.log(`Loading cached blocks from ${externalImport.url}`);
-        return JSON.parse(content);
+        blocks = JSON.parse(content);
+        console.log(`Loaded ${blocks.length} cached blocks from ${externalImport.url}`);
+        rememberExternalBlocks(blocks);
+    }
+    else {
+        const response = await downloadFromExternal(externalImport);
+        blocks = response.blocks;
+        console.log(`Downloaded ${blocks.length} blocks from ${externalImport.url}`);
+        await (0, fileUtils_1.writeFileMakeDir)(cacheFilePath, JSON.stringify(blocks, null, 2), 'utf-8');
     }
-    const response = await downloadFromExternal(externalImport);
-    const blocks = response.blocks;
-    console.log(`Downloaded ${blocks.length} blocks from ${externalImport.url}`);
-    await (0, fileUtils_1.writeFileMakeDir)(cacheFilePath, JSON.stringify(blocks, null, 2), 'utf-8');
     if (!configuration_1.config.production) {
         await saveImportedBlocks(externalImport, blocks);
     }
     return blocks;
 }
 async function downloadAll(externalImports) {
-    const responses = await Promise.all(externalImports.map(downloadAndSave));
+    downloadedExternalBlockNames = new Set();
+    const responses = await Promise.all([...externalImports].reverse().map(downloadAndSave));
     return lodash_1.default.flatten(responses);
 }
 async function downloadSettingsFromDb() {
@@ -138,4 +157,4 @@ async function loadAllBlocks() {
     return [...externalBlocks, ...localBlocks];
 }
 exports.loadAllBlocks = loadAllBlocks;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2xvYWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxrREFBMEI7QUFDMUIsb0RBQTRCO0FBQzVCLDJCQUFvQztBQUNwQyxrRkFBOEM7QUFDOUMscUNBQXNDO0FBQ3RDLG9EQUF1QjtBQUN2QixnREFBd0I7QUFDeEIsbURBQThEO0FBQzlELHFDQUErRDtBQUMvRCxpREFBaUY7QUFDakYsbUNBQTBEO0FBRzFELE1BQU0sbUJBQW1CLEdBQUcsV0FBVyxDQUFDO0FBRXhDLFNBQVMscUJBQXFCO0lBQzVCLE9BQU8sY0FBSSxDQUFDLElBQUksQ0FBQyxzQkFBTSxDQUFDLFNBQVMsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0FBQzFELENBQUM7QUFFRCxTQUFTLHFCQUFxQixDQUFDLGNBQW1DO0lBQ2hFLE9BQU8sY0FBSSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxFQUFFLGNBQWMsQ0FBQyxJQUFJLENBQUMsQ0FBQztBQUNqRSxDQUFDO0FBRUQsU0FBUyxtQkFBbUIsQ0FBQyxRQUFnQjtJQUMzQyxNQUFNLGtCQUFrQixHQUFHLHFCQUFxQixFQUFFLENBQUM7SUFDbkQsTUFBTSxnQkFBZ0IsR0FBRyxjQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2hELE1BQU0sb0JBQW9CLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQzlELE9BQU8sZ0JBQWdCLEtBQUssb0JBQW9CLElBQUksZ0JBQWdCLENBQUMsVUFBVSxDQUFDLEdBQUcsb0JBQW9CLEdBQUcsY0FBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUM7QUFDeEgsQ0FBQztBQUVELFNBQVMsbUJBQW1CLENBQUMsUUFBZ0I7SUFDM0MsT0FBTyxjQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENB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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marsx-dev/launcher",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "description": "MarsX launcher",
   "author": "MarsX team <team@marsx.dev>",
   "homepage": "https://marsx.dev/",

package/src/loader.ts

@@ -12,6 +12,7 @@ import { convertV3ToSfc, V3MongoBlock } from './utils/v3';
 
 type V4Response = { commit: string; hash: string; blocks: SfcBlock[] };
 const IMPORTED_BLOCKS_DIR = '_imported';
+let downloadedExternalBlockNames = new Set<string>();
 
 function getImportedBlocksRoot() {
   return path.join(config.blocksDir, IMPORTED_BLOCKS_DIR);
@@ -32,6 +33,25 @@ function isSettingsBlockFile(filePath: string) {
   return path.parse(filePath).name.endsWith('.settings');
 }
 
+function rememberExternalBlocks(blocks: SfcBlock[]) {
+  for (const block of blocks) {
+    downloadedExternalBlockNames.add(block.path.name);
+  }
+}
+
+function filterFreshExternalBlocks(blocks: SfcBlock[]) {
+  const result: SfcBlock[] = [];
+
+  for (const block of blocks) {
+    if (downloadedExternalBlockNames.has(block.path.name)) continue;
+
+    downloadedExternalBlockNames.add(block.path.name);
+    result.push(block);
+  }
+
+  return result;
+}
+
 async function downloadFromExternal(externalImport: ImportProjectConfig): Promise<V4Response> {
   const params = { api_key: externalImport.api_key, git_commit_ish: externalImport.git_commit_ish || '' };
 
@@ -39,20 +59,18 @@ async function downloadFromExternal(externalImport: ImportProjectConfig): Promis
   console.log(`Downloading blocks from ${url}`);
   try {
     const v4Resp = await axios.get<V4Response>(`${url}/api/GetExportedAppBlocksV4`, { params });
-    return v4Resp.data;
+    return { ...v4Resp.data, blocks: filterFreshExternalBlocks(v4Resp.data.blocks) };
   } catch (e) {
     console.log(`${url} does not support V4, fallback to V3`);
   }
 
   const v3Resp = await axios.get<V3MongoBlock[]>(`${url}/api/GetExportedAppBlocks`, { params });
-  const v3BlocksAllRaw = v3Resp.data.reverse();
-  const seenNames = new Set<string>();
   const v3Blocks: SfcBlock[] = [];
 
-  for (const block of v3BlocksAllRaw) {
-    if (seenNames.has(block.Name)) continue;
+  for (const block of v3Resp.data.reverse()) {
+    if (downloadedExternalBlockNames.has(block.Name)) continue;
 
-    seenNames.add(block.Name);
+    downloadedExternalBlockNames.add(block.Name);
     v3Blocks.push(convertV3ToSfc(block));
   }
 
@@ -79,18 +97,20 @@ function getImportCacheFilePath(externalImport: ImportProjectConfig) {
 
 async function downloadAndSave(externalImport: ImportProjectConfig): Promise<SfcBlock[]> {
   const cacheFilePath = getImportCacheFilePath(externalImport);
+  let blocks: SfcBlock[] = [];
 
   if (await isFile(cacheFilePath)) {
     const content = await fs.readFile(cacheFilePath, 'utf-8');
-    console.log(`Loading cached blocks from ${externalImport.url}`);
-    return JSON.parse(content) as SfcBlock[];
+    blocks = JSON.parse(content) as SfcBlock[];
+    console.log(`Loaded ${blocks.length} cached blocks from ${externalImport.url}`);
+    rememberExternalBlocks(blocks);
+  } else {
+    const response = await downloadFromExternal(externalImport);
+    blocks = response.blocks;
+    console.log(`Downloaded ${blocks.length} blocks from ${externalImport.url}`);
+    await writeFileMakeDir(cacheFilePath, JSON.stringify(blocks, null, 2), 'utf-8');
   }
 
-  const response = await downloadFromExternal(externalImport);
-  const blocks = response.blocks;
-  console.log(`Downloaded ${blocks.length} blocks from ${externalImport.url}`);
-  await writeFileMakeDir(cacheFilePath, JSON.stringify(blocks, null, 2), 'utf-8');
-
   if (!config.production) {
     await saveImportedBlocks(externalImport, blocks);
   }
@@ -99,7 +119,8 @@ async function downloadAndSave(externalImport: ImportProjectConfig): Promise<Sfc
 }
 
 async function downloadAll(externalImports: ImportProjectConfig[]) {
-  const responses = await Promise.all(externalImports.map(downloadAndSave));
+  downloadedExternalBlockNames = new Set<string>();
+  const responses = await Promise.all([...externalImports].reverse().map(downloadAndSave));
   return _.flatten(responses);
 }