@abtnode/auth 1.16.25-next-b726d470 → 1.16.25

package/lib/launcher.js

@@ -1,6 +1,6 @@
 const Joi = require('joi');
 const axios = require('@abtnode/util/lib/axios');
-const joinUrl = require('url-join');
+const { joinURL } = require('ufo');
 const pRetry = require('p-retry');
 const { stableStringify } = require('@arcblock/vc');
 const { toBase58 } = require('@ocap/util');
@@ -9,6 +9,8 @@ const formatError = require('@abtnode/util/lib/format-error');
 
 const logger = require('@abtnode/logger')('@abtnode/auth:launcher');
 
+const LAUNCHER_BLOCKLET_DID = 'z8iZkFBbrVQxZHvcWWB3Sa2TrfGmSeFz9MSU7';
+
 const schema = Joi.object({
   launcherSessionId: Joi.string().required(),
   launcherUrl: Joi.string().uri().required(),
@@ -23,9 +25,20 @@ const doRequest = async (serverSk, { launcherUrl, pathname, payload, method = 'p
   const wallet = getNodeWallet(serverSk);
 
   const fn = async () => {
+    const baseURL = new URL(launcherUrl).origin;
+    const { data: launcherMeta } = await axios.get(joinURL(baseURL, '__blocklet__.js?type=json'));
+    const mountPoint = launcherMeta.componentMountPoints?.find((x) => x.did === LAUNCHER_BLOCKLET_DID);
+    if (!mountPoint) {
+      throw new Error('launcher blocklet mount point not found');
+    }
+
+    const url = joinURL(baseURL, mountPoint.mountPoint, pathname);
+
+    logger.info('do launcher request', { url, method, payload });
+
     const { data } = await axios({
       method,
-      url: joinUrl(launcherUrl, pathname),
+      url,
       data: method !== 'get' ? payload : {},
       params: method === 'get' ? payload : {},
       headers: {
@@ -42,7 +55,7 @@ const doRequest = async (serverSk, { launcherUrl, pathname, payload, method = 'p
     minTimeout: delay,
     maxTimeout: delay,
     onFailedAttempt: (error) => {
-      logger.error('failed to call launcher', { error, launcherUrl, pathname, payload });
+      logger.error('failed to call launcher', { error, method, launcherUrl, pathname, payload });
       // Exclude retrying for 4XX response codes
       if (error.response && error.response.status >= 400 && error.response.status < 500) {
         throw error;
@@ -87,4 +100,5 @@ module.exports = {
   doRequest,
   getLauncherSession,
   getLauncherUser,
+  LAUNCHER_BLOCKLET_DID,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.25-next-b726d470",
+  "version": "1.16.25",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,17 +20,17 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.25-next-b726d470",
-    "@abtnode/logger": "1.16.25-next-b726d470",
-    "@abtnode/util": "1.16.25-next-b726d470",
+    "@abtnode/constant": "1.16.25",
+    "@abtnode/logger": "1.16.25",
+    "@abtnode/util": "1.16.25",
     "@arcblock/did": "1.18.113",
     "@arcblock/jwt": "^1.18.113",
-    "@arcblock/nft-display": "^2.9.60",
+    "@arcblock/nft-display": "^2.9.63",
     "@arcblock/validator": "^1.18.113",
     "@arcblock/vc": "1.18.113",
-    "@blocklet/constant": "1.16.25-next-b726d470",
-    "@blocklet/meta": "1.16.25-next-b726d470",
-    "@blocklet/sdk": "1.16.25-next-b726d470",
+    "@blocklet/constant": "1.16.25",
+    "@blocklet/meta": "1.16.25",
+    "@blocklet/sdk": "1.16.25",
     "@ocap/client": "^1.18.113",
     "@ocap/mcrypto": "1.18.113",
     "@ocap/util": "1.18.113",
@@ -51,5 +51,5 @@
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "3adef75441748e01ccba82fa1bfd875cbd096185"
+  "gitHead": "8752b9a0caa8745e16e1de8db4ef696b713ffb4d"
 }