@blocklet/meta 1.16.0-beta-1d6c582e → 1.16.0-beta-62b42401

package/lib/blockies.d.ts

@@ -0,0 +1,15 @@
+export declare function createImageData(size: number): number[];
+export declare function buildOpts(opts: {
+    seed: string;
+    size?: number;
+    scale?: number;
+}): BlockiesOptions;
+export interface BlockiesOptions {
+    seed: string;
+    size: number;
+    scale: number;
+    color: string;
+    bgcolor: string;
+    spotcolor: string;
+}
+export declare function createBlockiesSvg(address: string, size?: number, caseSensitive?: boolean, scale?: number): string;

package/lib/blockies.js

@@ -0,0 +1,108 @@
+"use strict";
+/* eslint-disable no-bitwise */
+/* eslint-disable prefer-destructuring */
+// Forked from https://github.com/download13/blockies
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBlockiesSvg = exports.buildOpts = exports.createImageData = void 0;
+// The random number is a js implementation of the Xorshift PRNG
+const randseed = new Array(4); // Xorshift: [x, y, z, w] 32 bit values
+function seedrand(seed) {
+    randseed.fill(0);
+    for (let i = 0; i < seed.length; i++) {
+        randseed[i % 4] = (randseed[i % 4] << 5) - randseed[i % 4] + seed.charCodeAt(i);
+    }
+}
+function rand() {
+    // based on Java's String.hashCode(), expanded to 4 32bit values
+    const t = randseed[0] ^ (randseed[0] << 11);
+    randseed[0] = randseed[1];
+    randseed[1] = randseed[2];
+    randseed[2] = randseed[3];
+    randseed[3] = randseed[3] ^ (randseed[3] >> 19) ^ t ^ (t >> 8);
+    return (randseed[3] >>> 0) / ((1 << 31) >>> 0);
+}
+function createColor() {
+    // saturation is the whole color spectrum
+    const h = Math.floor(rand() * 360);
+    // saturation goes from 40 to 100, it avoids greyish colors
+    const s = `${(rand() * 60 + 40).toFixed(1)}%`;
+    // lightness can be anything from 0 to 100, but probabilities are a bell curve around 50%
+    const l = `${((rand() + rand() + rand() + rand()) * 25).toFixed(1)}%`;
+    return `hsl(${h},${s},${l})`;
+}
+function createImageData(size) {
+    const width = size; // Only support square icons for now
+    const height = size;
+    const dataWidth = Math.ceil(width / 2);
+    const mirrorWidth = width - dataWidth;
+    const data = [];
+    for (let y = 0; y < height; y++) {
+        let row = [];
+        for (let x = 0; x < dataWidth; x++) {
+            // this makes foreground and background color to have a 43% (1/2.3) probability
+            // spot color has 13% chance
+            row[x] = Math.floor(rand() * 2.3);
+        }
+        const r = row.slice(0, mirrorWidth);
+        r.reverse();
+        row = row.concat(r);
+        for (let i = 0; i < row.length; i++) {
+            data.push(row[i]);
+        }
+    }
+    return data;
+}
+exports.createImageData = createImageData;
+function buildOpts(opts) {
+    seedrand(opts.seed);
+    const newOpts = {
+        seed: opts.seed,
+        size: opts.size || 8,
+        scale: opts.scale || 10,
+        color: createColor(),
+        bgcolor: createColor(),
+        spotcolor: createColor(),
+    };
+    return newOpts;
+}
+exports.buildOpts = buildOpts;
+function createBlockiesSvg(address, size = 8, caseSensitive = false, scale = 10) {
+    if (!address)
+        throw new Error('Address is required');
+    const opts = buildOpts({ seed: caseSensitive ? address : address.toLowerCase(), size, scale });
+    const imageData = createImageData(opts.size);
+    const width = size * scale;
+    const shapes = imageData
+        ?.map((value, i) => {
+        if (value === 1) {
+            const row = (i % size) * scale;
+            const col = Math.floor(i / size) * scale;
+            return `<rect width="${scale}" height="${scale}" x="${row}" y="${col}" />`;
+        }
+        return null;
+    })
+        .filter(Boolean)
+        .join('');
+    const spots = imageData
+        ?.map((value, i) => {
+        if (value === 2) {
+            const row = (i % size) * scale;
+            const col = Math.floor(i / size) * scale;
+            return `<rect width="${scale}" height="${scale}" x="${row}" y="${col}" />`;
+        }
+        return null;
+    })
+        .filter(Boolean)
+        .join('');
+    return `
+		<svg width="${width}" height="${width}" viewBox="0 0 ${width} ${width}" xmlns="http://www.w3.org/2000/svg">
+			<rect width="${width}" height="${width}" fill="${opts.bgcolor}" />
+			<g fill="${opts.color}">
+				${shapes}
+			</g>
+			<g fill="${opts.spotcolor}">
+				${spots}
+			</g>
+		</svg>`;
+}
+exports.createBlockiesSvg = createBlockiesSvg;

package/lib/index.d.ts

@@ -67,7 +67,7 @@ declare const _default: {
     fixName: (meta: any) => any;
     fixService: (meta: import("./types").TBlockletMeta) => import("./types").TBlockletMeta;
     toBlockletDid: (name: string | Buffer) => string;
-    getBlockletWallet: (blockletDid: string, nodeSk?: string, type?: string | import("@arcblock/did").DIDType, index?: number) => import("@ocap/wallet").WalletObject<string>;
+    getBlockletWallet: (didOrSk: string, nodeSk?: string, type?: "default" | "eth" | import("@arcblock/did").DIDType, index?: number) => import("@ocap/wallet").WalletObject<string>;
     getBlockletInfo: (state: import("@abtnode/client").BlockletState, nodeSk?: string, { returnWallet }?: {
         returnWallet?: boolean;
     }) => {

package/lib/parse-navigation-from-blocklet.js

@@ -507,7 +507,15 @@ function parseNavigation(blocklet = {}, options = {}) {
     const splitNavigation = splitNavigationBySection(patchedNavigation);
     // 将 footer-social, footer-bottom, sessionManager 的二级菜单提升为一级菜单
     const levelUpNavigation = splitNavigation.reduce((all, cur) => {
-        if (['bottom', 'social', 'sessionManager'].includes(cur.section)) {
+        const shouldLevelUp = ['bottom', 'social', 'sessionManager'].includes(cur.section);
+        let isRoot = false;
+        // 在更新为容器模式后，最终生成的 navigation 会将 '/' 的子菜单提升为一级菜单
+        // 同时兼容非容器模式（root-blocklet 不会出现在 components 中）
+        const rootBlocklet = components.find((item) => item.link === '/');
+        if (rootBlocklet && cur.id === rootBlocklet.did) {
+            isRoot = true;
+        }
+        if (shouldLevelUp || isRoot) {
             if (cur.items && cur.items.length > 0) {
                 all.push(...cur.items.map((x) => {
                     const { section } = cur;
@@ -517,6 +525,10 @@ function parseNavigation(blocklet = {}, options = {}) {
                 }));
                 return all;
             }
+            // root blocklet 不应该出现在菜单中
+            if (isRoot) {
+                return all;
+            }
         }
         all.push(cur);
         return all;

package/lib/wallet.d.ts

@@ -5,5 +5,5 @@ import { DIDType } from '@arcblock/did';
  *
  * Spec: https://github.com/ArcBlock/ABT-DID-Protocol#request-did-authentication
  */
-declare const getApplicationWallet: (blockletDid: string, nodeSk?: string, type?: DIDType | string, index?: number) => WalletObject;
+declare const getApplicationWallet: (didOrSk: string, nodeSk?: string, type?: DIDType | 'default' | 'eth', index?: number) => WalletObject;
 export = getApplicationWallet;

package/lib/wallet.js

@@ -3,16 +3,31 @@ const mcrypto_1 = require("@ocap/mcrypto");
 const wallet_1 = require("@ocap/wallet");
 const did_1 = require("@arcblock/did");
 const did_ext_1 = require("@arcblock/did-ext");
+const defaults = { role: mcrypto_1.types.RoleType.ROLE_APPLICATION };
 /**
  * Gen DID from blocklet did and nodeSk
  *
  * Spec: https://github.com/ArcBlock/ABT-DID-Protocol#request-did-authentication
  */
-const getApplicationWallet = (blockletDid, nodeSk, type, index) => {
-    const t = type || { role: mcrypto_1.types.RoleType.ROLE_APPLICATION };
-    if (!(0, did_1.isValid)(blockletDid)) {
+const getApplicationWallet = (didOrSk, nodeSk, type, index) => {
+    let t = type || defaults;
+    const isEthereum = (0, did_1.isEthereumType)((0, did_1.DidType)(type));
+    if (isEthereum) {
+        t = (0, wallet_1.WalletType)(type);
+    }
+    else {
+        t = (0, wallet_1.WalletType)(defaults);
+    }
+    if (!(0, did_1.isValid)(didOrSk)) {
+        let sk = '';
         try {
-            return (0, wallet_1.fromSecretKey)(blockletDid, t);
+            if (isEthereum) {
+                sk = didOrSk.slice(0, 66);
+            }
+            else {
+                sk = didOrSk;
+            }
+            return (0, wallet_1.fromSecretKey)(sk, t);
         }
         catch (err) {
             throw new Error(`Cannot get blocklet wallet with invalid blocklet did or custom sk: ${err.message}`);
@@ -21,6 +36,6 @@ const getApplicationWallet = (blockletDid, nodeSk, type, index) => {
     if (!nodeSk) {
         throw new Error('Cannot get blocklet wallet with empty node sk');
     }
-    return (0, did_ext_1.fromAppDid)(blockletDid, nodeSk, t, index || 0);
+    return (0, did_ext_1.fromAppDid)(didOrSk, nodeSk, t, index || 0);
 };
 module.exports = getApplicationWallet;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-1d6c582e",
+  "version": "1.16.0-beta-62b42401",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,19 +24,19 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.16.0-beta-1d6c582e",
-    "@abtnode/constant": "1.16.0-beta-1d6c582e",
-    "@abtnode/util": "1.16.0-beta-1d6c582e",
-    "@arcblock/did": "1.18.62",
-    "@arcblock/did-ext": "1.18.62",
-    "@arcblock/did-util": "1.18.62",
-    "@arcblock/jwt": "1.18.62",
-    "@blocklet/constant": "1.16.0-beta-1d6c582e",
-    "@ocap/asset": "1.18.62",
-    "@ocap/mcrypto": "1.18.62",
-    "@ocap/types": "1.18.62",
-    "@ocap/util": "1.18.62",
-    "@ocap/wallet": "1.18.62",
+    "@abtnode/client": "1.16.0-beta-62b42401",
+    "@abtnode/constant": "1.16.0-beta-62b42401",
+    "@abtnode/util": "1.16.0-beta-62b42401",
+    "@arcblock/did": "1.18.63",
+    "@arcblock/did-ext": "1.18.63",
+    "@arcblock/did-util": "1.18.63",
+    "@arcblock/jwt": "1.18.63",
+    "@blocklet/constant": "1.16.0-beta-62b42401",
+    "@ocap/asset": "1.18.63",
+    "@ocap/mcrypto": "1.18.63",
+    "@ocap/types": "1.18.63",
+    "@ocap/util": "1.18.63",
+    "@ocap/wallet": "1.18.63",
     "ajv": "^8.11.0",
     "axios": "^0.27.2",
     "cjk-length": "^1.0.0",
@@ -59,7 +59,7 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@abtnode/client": "^1.8.68",
+    "@abtnode/client": "1.8.68",
     "@arcblock/eslint-config-ts": "^0.2.3",
     "@types/express": "^4.17.14",
     "@types/jest": "^29.2.2",
@@ -81,5 +81,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "209fa1413ae05d8961942b2c21f2d83df66f4b68"
+  "gitHead": "6ef1c3601d0cfdcf5da0b55b4c54ef1fa9fce7d2"
 }