@blocklet/store 1.16.29-next-680cf137 → 1.16.29

package/dist/index.cjs

@@ -7,13 +7,17 @@ const SealedBox = require('tweetnacl-sealedbox-js');
 const ufo = require('ufo');
 const axios = require('@abtnode/util/lib/axios');
 const pWaitFor = require('p-wait-for');
-const wallet = require('@ocap/wallet');
-const util$1 = require('@blocklet/meta/lib/util');
-const path = require('path');
-const fs$1 = require('fs-extra');
 const did = require('@arcblock/did');
 const v2 = require('@blocklet/meta/lib/payment/v2');
+const util$1 = require('@blocklet/meta/lib/util');
+const utilMeta = require('@blocklet/meta/lib/util-meta');
+const wallet = require('@ocap/wallet');
 const FormData = require('form-data');
+const fs$1 = require('fs-extra');
+const yaml = require('js-yaml');
+const pAll = require('p-all');
+const path = require('path');
+const createBlockletRelease = require('@abtnode/util/lib/create-blocklet-release');
 const Client = require('@ocap/client');
 const constant$1 = require('@abtnode/constant');
 const constant = require('@blocklet/constant');
@@ -28,9 +32,11 @@ const tweetnacl__default = /*#__PURE__*/_interopDefaultCompat(tweetnacl);
 const SealedBox__default = /*#__PURE__*/_interopDefaultCompat(SealedBox);
 const axios__default = /*#__PURE__*/_interopDefaultCompat(axios);
 const pWaitFor__default = /*#__PURE__*/_interopDefaultCompat(pWaitFor);
-const path__default = /*#__PURE__*/_interopDefaultCompat(path);
-const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs$1);
 const FormData__default = /*#__PURE__*/_interopDefaultCompat(FormData);
+const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs$1);
+const yaml__default = /*#__PURE__*/_interopDefaultCompat(yaml);
+const pAll__default = /*#__PURE__*/_interopDefaultCompat(pAll);
+const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const Client__default = /*#__PURE__*/_interopDefaultCompat(Client);
 const stableStringify__default = /*#__PURE__*/_interopDefaultCompat(stableStringify);
 const xbytes__default = /*#__PURE__*/_interopDefaultCompat(xbytes);
@@ -155,6 +161,7 @@ async function createConnect({
       source,
       closeOnSuccess
     });
+    console.log("If browser does not open automatically, please open the following link in your browser:", pageUrl);
     openPage?.(pageUrl);
     return await wrapSpinner(`Waiting for connection: ${connectUrl}`, async () => {
       const fetchData = await fetchConfigs({
@@ -242,6 +249,17 @@ const ensureBlockletNftFactory = async ({
   return itx.address;
 };
 
+function replaceOrigin(originalUrl, newUrl) {
+  try {
+    const originalUrlObj = new URL(originalUrl);
+    const newUrlObj = new URL(newUrl, originalUrlObj.origin);
+    return originalUrl.replace(originalUrlObj.origin, newUrlObj.origin);
+  } catch (error) {
+    console.error("Invalid URL provided:", error);
+    return originalUrl;
+  }
+}
+
 const sign = (blockletMeta, wallet) => {
   const walletJSON = wallet.toJSON();
   const signatureData = {
@@ -282,6 +300,7 @@ async function upload({
   developerDid,
   metaFile,
   source,
+  possibleSameStore,
   wrapSpinner = baseWrapSpinner,
   printSuccess = () => {
   },
@@ -294,6 +313,57 @@ async function upload({
     throw new Error(`Invalid release meta file ${metaFile} not exists`);
   }
   const meta = fs__default$1.readJSONSync(metaFile);
+  const releaseReleaseDir = path__default.resolve(metaFile, "..", "..", "bundle");
+  if (possibleSameStore && meta.components) {
+    const parseSource = async (component) => {
+      try {
+        const nextComponent = { ...component };
+        if (nextComponent.source) {
+          nextComponent.source = { ...nextComponent.source };
+          if (nextComponent.source.url) {
+            nextComponent.source.url = replaceOrigin(nextComponent.source.url, storeUrl);
+            const res = await axios__default.get(nextComponent.source.url);
+            return res?.data?.did ? nextComponent : component;
+          }
+          nextComponent.source.store = storeUrl;
+        } else {
+          nextComponent.source = { name: component.name, store: storeUrl, version: "latest" };
+        }
+        const urls = utilMeta.getSourceUrlsFromConfig(nextComponent);
+        await utilMeta.getBlockletMetaFromUrls(urls, {
+          returnUrl: false,
+          validateFn: () => true,
+          ensureTarball: false
+        });
+        return nextComponent;
+      } catch (err) {
+        return component;
+      }
+    };
+    const events = meta.components.map((component) => {
+      return () => parseSource(component);
+    });
+    meta.components = await pAll__default(events, { concurrency: 4 });
+    const yamlFile = path__default.join(releaseReleaseDir, "blocklet.yml");
+    const metaYaml = yaml__default.load(fs__default$1.readFileSync(yamlFile).toString(), { json: true });
+    metaYaml.components = meta.components;
+    if (meta.engine && meta.engine?.source?.store) {
+      meta.engine = await parseSource({ ...meta.engine });
+      metaYaml.engine = meta.engine;
+    }
+    fs__default$1.writeFileSync(yamlFile, yaml__default.dump(metaYaml, { sortKeys: false, skipInvalid: true }));
+    const dir = path__default.resolve(metaFile, "..", "..");
+    const release = await createBlockletRelease.createRelease(dir, {
+      printError: (err) => {
+        throw err;
+      },
+      printInfo: () => {
+      },
+      tarball: meta.dist.tarball
+    });
+    meta.dist.integrity = release.meta.dist.integrity;
+    meta.dist.size = release.meta.dist.size;
+  }
   if (meta.payment === void 0) {
     const { charging } = meta;
     const payment = {};

package/dist/index.d.cts

@@ -28,6 +28,7 @@ interface UploadOptions {
     storeUrl: string;
     accessToken: string;
     developerDid: string;
+    possibleSameStore?: boolean;
     metaFile: string;
     source: string;
     wrapSpinner?: typeof baseWrapSpinner;
@@ -35,6 +36,6 @@ interface UploadOptions {
     printTar: (meta: unknown, metaPath: string) => Promise<void>;
     debug: (...args: unknown[]) => void;
 }
-declare function upload({ storeUrl, accessToken, developerDid, metaFile, source, wrapSpinner, printSuccess, printTar, debug, }: UploadOptions): Promise<BlockletMeta | undefined>;
+declare function upload({ storeUrl, accessToken, developerDid, metaFile, source, possibleSameStore, wrapSpinner, printSuccess, printTar, debug, }: UploadOptions): Promise<BlockletMeta | undefined>;
 
 export { type UploadOptions, createConnect, upload };

package/dist/index.d.mts

@@ -28,6 +28,7 @@ interface UploadOptions {
     storeUrl: string;
     accessToken: string;
     developerDid: string;
+    possibleSameStore?: boolean;
     metaFile: string;
     source: string;
     wrapSpinner?: typeof baseWrapSpinner;
@@ -35,6 +36,6 @@ interface UploadOptions {
     printTar: (meta: unknown, metaPath: string) => Promise<void>;
     debug: (...args: unknown[]) => void;
 }
-declare function upload({ storeUrl, accessToken, developerDid, metaFile, source, wrapSpinner, printSuccess, printTar, debug, }: UploadOptions): Promise<BlockletMeta | undefined>;
+declare function upload({ storeUrl, accessToken, developerDid, metaFile, source, possibleSameStore, wrapSpinner, printSuccess, printTar, debug, }: UploadOptions): Promise<BlockletMeta | undefined>;
 
 export { type UploadOptions, createConnect, upload };

package/dist/index.d.ts

@@ -28,6 +28,7 @@ interface UploadOptions {
     storeUrl: string;
     accessToken: string;
     developerDid: string;
+    possibleSameStore?: boolean;
     metaFile: string;
     source: string;
     wrapSpinner?: typeof baseWrapSpinner;
@@ -35,6 +36,6 @@ interface UploadOptions {
     printTar: (meta: unknown, metaPath: string) => Promise<void>;
     debug: (...args: unknown[]) => void;
 }
-declare function upload({ storeUrl, accessToken, developerDid, metaFile, source, wrapSpinner, printSuccess, printTar, debug, }: UploadOptions): Promise<BlockletMeta | undefined>;
+declare function upload({ storeUrl, accessToken, developerDid, metaFile, source, possibleSameStore, wrapSpinner, printSuccess, printTar, debug, }: UploadOptions): Promise<BlockletMeta | undefined>;
 
 export { type UploadOptions, createConnect, upload };

package/dist/index.mjs

@@ -5,13 +5,17 @@ import SealedBox from 'tweetnacl-sealedbox-js';
 import { withQuery, joinURL } from 'ufo';
 import axios from '@abtnode/util/lib/axios';
 import pWaitFor from 'p-wait-for';
-import { fromSecretKey } from '@ocap/wallet';
-import { isFreeBlocklet } from '@blocklet/meta/lib/util';
-import path from 'path';
-import fs$1 from 'fs-extra';
 import { isValid, toTypeInfo, types } from '@arcblock/did';
 import { createNftFactoryItx, checkFreeBlocklet } from '@blocklet/meta/lib/payment/v2';
+import { isFreeBlocklet } from '@blocklet/meta/lib/util';
+import { getSourceUrlsFromConfig, getBlockletMetaFromUrls } from '@blocklet/meta/lib/util-meta';
+import { fromSecretKey } from '@ocap/wallet';
 import FormData from 'form-data';
+import fs$1 from 'fs-extra';
+import yaml from 'js-yaml';
+import pAll from 'p-all';
+import path from 'path';
+import { createRelease } from '@abtnode/util/lib/create-blocklet-release';
 import Client from '@ocap/client';
 import { BLOCKLET_STORE_META_PATH } from '@abtnode/constant';
 import { BLOCKLET_FACTORY_SHARES } from '@blocklet/constant';
@@ -139,6 +143,7 @@ async function createConnect({
       source,
       closeOnSuccess
     });
+    console.log("If browser does not open automatically, please open the following link in your browser:", pageUrl);
     openPage?.(pageUrl);
     return await wrapSpinner(`Waiting for connection: ${connectUrl}`, async () => {
       const fetchData = await fetchConfigs({
@@ -226,6 +231,17 @@ const ensureBlockletNftFactory = async ({
   return itx.address;
 };
 
+function replaceOrigin(originalUrl, newUrl) {
+  try {
+    const originalUrlObj = new URL(originalUrl);
+    const newUrlObj = new URL(newUrl, originalUrlObj.origin);
+    return originalUrl.replace(originalUrlObj.origin, newUrlObj.origin);
+  } catch (error) {
+    console.error("Invalid URL provided:", error);
+    return originalUrl;
+  }
+}
+
 const sign = (blockletMeta, wallet) => {
   const walletJSON = wallet.toJSON();
   const signatureData = {
@@ -266,6 +282,7 @@ async function upload({
   developerDid,
   metaFile,
   source,
+  possibleSameStore,
   wrapSpinner = baseWrapSpinner,
   printSuccess = () => {
   },
@@ -278,6 +295,57 @@ async function upload({
     throw new Error(`Invalid release meta file ${metaFile} not exists`);
   }
   const meta = fs$1.readJSONSync(metaFile);
+  const releaseReleaseDir = path.resolve(metaFile, "..", "..", "bundle");
+  if (possibleSameStore && meta.components) {
+    const parseSource = async (component) => {
+      try {
+        const nextComponent = { ...component };
+        if (nextComponent.source) {
+          nextComponent.source = { ...nextComponent.source };
+          if (nextComponent.source.url) {
+            nextComponent.source.url = replaceOrigin(nextComponent.source.url, storeUrl);
+            const res = await axios.get(nextComponent.source.url);
+            return res?.data?.did ? nextComponent : component;
+          }
+          nextComponent.source.store = storeUrl;
+        } else {
+          nextComponent.source = { name: component.name, store: storeUrl, version: "latest" };
+        }
+        const urls = getSourceUrlsFromConfig(nextComponent);
+        await getBlockletMetaFromUrls(urls, {
+          returnUrl: false,
+          validateFn: () => true,
+          ensureTarball: false
+        });
+        return nextComponent;
+      } catch (err) {
+        return component;
+      }
+    };
+    const events = meta.components.map((component) => {
+      return () => parseSource(component);
+    });
+    meta.components = await pAll(events, { concurrency: 4 });
+    const yamlFile = path.join(releaseReleaseDir, "blocklet.yml");
+    const metaYaml = yaml.load(fs$1.readFileSync(yamlFile).toString(), { json: true });
+    metaYaml.components = meta.components;
+    if (meta.engine && meta.engine?.source?.store) {
+      meta.engine = await parseSource({ ...meta.engine });
+      metaYaml.engine = meta.engine;
+    }
+    fs$1.writeFileSync(yamlFile, yaml.dump(metaYaml, { sortKeys: false, skipInvalid: true }));
+    const dir = path.resolve(metaFile, "..", "..");
+    const release = await createRelease(dir, {
+      printError: (err) => {
+        throw err;
+      },
+      printInfo: () => {
+      },
+      tarball: meta.dist.tarball
+    });
+    meta.dist.integrity = release.meta.dist.integrity;
+    meta.dist.size = release.meta.dist.size;
+  }
   if (meta.payment === void 0) {
     const { charging } = meta;
     const payment = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/store",
-  "version": "1.16.29-next-680cf137",
+  "version": "1.16.29",
   "description": "Connect Store and upload blocklet to Store",
   "publishConfig": {
     "access": "public"
@@ -27,18 +27,20 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@abtnode/constant": "1.16.29-next-680cf137",
-    "@abtnode/util": "1.16.29-next-680cf137",
-    "@arcblock/did": "1.18.126",
-    "@blocklet/constant": "1.16.29-next-680cf137",
-    "@blocklet/meta": "1.16.29-next-680cf137",
-    "@ocap/client": "^1.18.126",
-    "@ocap/util": "1.18.126",
-    "@ocap/wallet": "1.18.126",
+    "@abtnode/constant": "1.16.29",
+    "@abtnode/util": "1.16.29",
+    "@arcblock/did": "1.18.128",
+    "@blocklet/constant": "1.16.29",
+    "@blocklet/meta": "1.16.29",
+    "@ocap/client": "^1.18.128",
+    "@ocap/util": "1.18.128",
+    "@ocap/wallet": "1.18.128",
     "form-data": "^4.0.0",
     "fs-extra": "^11.2.0",
+    "js-yaml": "^4.1.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
+    "p-all": "3.0.0",
     "p-wait-for": "3.2.0",
     "tweetnacl": "^1.0.3",
     "tweetnacl-sealedbox-js": "^1.2.0",
@@ -48,6 +50,7 @@
   "devDependencies": {
     "@arcblock/eslint-config-ts": "^0.3.2",
     "@types/jest": "^29.5.11",
+    "@types/js-yaml": "^4.0.5",
     "@types/node": "^18.11.0",
     "@typescript-eslint/eslint-plugin": "^5.40.1",
     "@typescript-eslint/parser": "^5.40.1",
@@ -59,5 +62,5 @@
     "typescript": "^5.0.4",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "17b7e7c5e43c497980d4fe6b5bb20609328041bd"
+  "gitHead": "6c49cffcab4fd0dffc6bed261a5eddf733280ae7"
 }