@abtnode/core 1.16.29-beta-87e06e1c → 1.16.29-beta-2eaf40bc

package/lib/util/blocklet.js

@@ -1503,6 +1503,16 @@ const validateAppConfig = async (config, states) => {
     }
   }
 
+  if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL) {
+    if (isEmpty(x.value)) {
+      throw new Error(`${x.key} can not be empty`);
+    }
+
+    if (!isUrl(x.value)) {
+      throw new Error(`${x.key}(${x.value}) is not a valid URL`);
+    }
+  }
+
   if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME) {
     x.value = await titleSchema.validateAsync(x.value);
   }
@@ -1545,7 +1555,7 @@ const validateAppConfig = async (config, states) => {
   if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACE_ENDPOINT) {
     // @note: value 置空以表删除
     if (x.value && !isUrl(x.value)) {
-      throw new Error(`${x.key}(${x.value}) is not a valid http address`);
+      throw new Error(`${x.key}(${x.value}) is not a valid URL`);
     }
   }
 
@@ -1555,7 +1565,7 @@ const validateAppConfig = async (config, states) => {
     }
 
     if (!isUrl(x.value)) {
-      throw new Error(`${x.key}(${x.value}) is not a valid http address`);
+      throw new Error(`${x.key}(${x.value}) is not a valid URL`);
     }
   }
 
@@ -1565,7 +1575,7 @@ const validateAppConfig = async (config, states) => {
     }
 
     if (!isUrl(x.value)) {
-      throw new Error(`${x.key}(${x.value}) is not a valid http address`);
+      throw new Error(`${x.key}(${x.value}) is not a valid URL`);
     }
   }
 };

package/lib/util/launcher.js

@@ -173,7 +173,7 @@ const consumeLauncherSession = async ({ params, blocklet }) => {
   }
 };
 
-const setupAppOwner = async (node, sessionId) => {
+const setupAppOwner = async (node, sessionId, justCreate = false) => {
   const session = await node.getSession({ id: sessionId });
   if (!session) {
     throw new Error(`Blocklet setup session not found in server: ${sessionId}`);
@@ -292,7 +292,11 @@ const setupAppOwner = async (node, sessionId) => {
     expiresIn: '1d',
   });
 
-  await node.setBlockletOwner({ did: appDid, owner: { did: ownerDid, pk: ownerPk } });
+  if (justCreate) {
+    await node.setBlockletInitialized({ did: appDid, owner: { did: ownerDid, pk: ownerPk } });
+  } else {
+    await node.setBlockletOwner({ did: appDid, owner: { did: ownerDid, pk: ownerPk } });
+  }
 
   return {
     session,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.29-beta-87e06e1c",
+  "version": "1.16.29-beta-2eaf40bc",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.29-beta-87e06e1c",
-    "@abtnode/auth": "1.16.29-beta-87e06e1c",
-    "@abtnode/certificate-manager": "1.16.29-beta-87e06e1c",
-    "@abtnode/constant": "1.16.29-beta-87e06e1c",
-    "@abtnode/cron": "1.16.29-beta-87e06e1c",
-    "@abtnode/logger": "1.16.29-beta-87e06e1c",
-    "@abtnode/models": "1.16.29-beta-87e06e1c",
-    "@abtnode/queue": "1.16.29-beta-87e06e1c",
-    "@abtnode/rbac": "1.16.29-beta-87e06e1c",
-    "@abtnode/router-provider": "1.16.29-beta-87e06e1c",
-    "@abtnode/static-server": "1.16.29-beta-87e06e1c",
-    "@abtnode/timemachine": "1.16.29-beta-87e06e1c",
-    "@abtnode/util": "1.16.29-beta-87e06e1c",
+    "@abtnode/analytics": "1.16.29-beta-2eaf40bc",
+    "@abtnode/auth": "1.16.29-beta-2eaf40bc",
+    "@abtnode/certificate-manager": "1.16.29-beta-2eaf40bc",
+    "@abtnode/constant": "1.16.29-beta-2eaf40bc",
+    "@abtnode/cron": "1.16.29-beta-2eaf40bc",
+    "@abtnode/logger": "1.16.29-beta-2eaf40bc",
+    "@abtnode/models": "1.16.29-beta-2eaf40bc",
+    "@abtnode/queue": "1.16.29-beta-2eaf40bc",
+    "@abtnode/rbac": "1.16.29-beta-2eaf40bc",
+    "@abtnode/router-provider": "1.16.29-beta-2eaf40bc",
+    "@abtnode/static-server": "1.16.29-beta-2eaf40bc",
+    "@abtnode/timemachine": "1.16.29-beta-2eaf40bc",
+    "@abtnode/util": "1.16.29-beta-2eaf40bc",
     "@arcblock/did": "1.18.126",
     "@arcblock/did-auth": "1.18.126",
     "@arcblock/did-ext": "^1.18.126",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.126",
     "@arcblock/vc": "1.18.126",
-    "@blocklet/constant": "1.16.29-beta-87e06e1c",
-    "@blocklet/env": "1.16.29-beta-87e06e1c",
-    "@blocklet/meta": "1.16.29-beta-87e06e1c",
-    "@blocklet/resolver": "1.16.29-beta-87e06e1c",
-    "@blocklet/sdk": "1.16.29-beta-87e06e1c",
-    "@blocklet/store": "1.16.29-beta-87e06e1c",
+    "@blocklet/constant": "1.16.29-beta-2eaf40bc",
+    "@blocklet/env": "1.16.29-beta-2eaf40bc",
+    "@blocklet/meta": "1.16.29-beta-2eaf40bc",
+    "@blocklet/resolver": "1.16.29-beta-2eaf40bc",
+    "@blocklet/sdk": "1.16.29-beta-2eaf40bc",
+    "@blocklet/store": "1.16.29-beta-2eaf40bc",
     "@did-space/client": "^0.5.4",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.126",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "e6a32801bc392566448d4df00c2ae68717f39822"
+  "gitHead": "d723d07ca8914468fc1b53af23aa53dc343e0a8c"
 }