@blocklet/launcher-util 2.2.54 → 2.2.56

package/es/constant.js

@@ -24,6 +24,7 @@ const LAUNCH_STATUS = Object.freeze({
   selected: 10,
   connected: 20,
   paid: 30,
+  nftMinted: 35,
   allocated: 40,
   consuming: 46,
   installed: 50,
@@ -32,6 +33,12 @@ const LAUNCH_STATUS = Object.freeze({
   timeout: 80,
   transferred: 90
 });
+const LAUNCH_SESSION_TYPE = Object.freeze({
+  serverless: "serverless",
+  dedicated: "dedicated",
+  onDemand: "on-demand"
+  // FIXME: on-demand 是兼容字段，未来该字段会被移除
+});
 const SERVERLESS_INSTANCE_STATUS = {
   launching: 10,
   running: 20,
@@ -55,6 +62,7 @@ const SERVER_ACTIVITY_TYPE = Object.freeze({
   launch: "launch",
   createFailed: "createFailed",
   created: "created",
+  modifiedInstanceType: "modifiedInstanceType",
   start: "start",
   started: "started",
   startFailed: "startFailed",
@@ -79,10 +87,12 @@ const toMap = (status) => Object.keys(status).reduce((acc, cur) => {
 const fromStatus = (map) => (status) => map[status];
 const statusInstanceMap = toMap(INSTANCE_STATUS);
 const planStatusMap = toMap(PLAN_STATUS);
+const launchStatusMap = toMap(LAUNCH_STATUS);
 const fromInstanceStatus = fromStatus(statusInstanceMap);
 const fromPlanStatus = fromStatus(planStatusMap);
+const fromLaunchStatus = fromStatus(launchStatusMap);
 const NFT_TYPE_SERVERLESS = "BlockletServerServerlessNFT";
-const BLOCKLET_SERVER_OWNERSHIP_NFT = "BlockletServerOwnershipNFT";
+const NFT_TYPE_DEDICATE = "BlockletServerOwnershipNFT";
 const TIME_LOCALE = {
   en: {
     h: "hour",
@@ -145,17 +155,23 @@ const CURRENCY_TYPE = {
   crypto: "crypto"
 };
 const SERVERLESS_RETAIN_DAYS = 30;
+const APP_RECORD_TYPE = {
+  install: "install",
+  uninstall: "uninstall"
+};
 export {
+  APP_RECORD_TYPE,
   APP_TYPE,
-  BLOCKLET_SERVER_OWNERSHIP_NFT,
   CURRENCY_TYPE,
   DID_DOMAIN_SUFFIX,
   INSTANCE_MAX_DESC_LENGTH,
   INSTANCE_MAX_NAME_LENGTH,
   INSTANCE_STATUS,
   LAUNCH_ACTIVITY_TYPE,
+  LAUNCH_SESSION_TYPE,
   LAUNCH_STATUS,
   LAUNCH_TYPE,
+  NFT_TYPE_DEDICATE,
   NFT_TYPE_SERVERLESS,
   PAYMENT_METHODS,
   PAYMENT_STATUS,
@@ -168,5 +184,6 @@ export {
   SKU_STATUS,
   TIME_LOCALE,
   fromInstanceStatus,
+  fromLaunchStatus,
   fromPlanStatus
 };

package/es/get-asset.js

@@ -1,6 +1,6 @@
 import joinUrl from "url-join";
 import axios from "axios";
-import get from "lodash.get";
+import get from "lodash/get";
 const getAsset = async (chainHost, address) => {
   const url = joinUrl(new URL(chainHost).origin, "/api/gql/");
   const result = await axios.post(

package/es/middleware.js

@@ -1,4 +1,4 @@
-import pick from "lodash.pick";
+import pick from "lodash/pick";
 import { getSort } from "./util";
 const MAX_PAGING_SIZE = 100;
 const DEFAULT_PAGING_SIZE = MAX_PAGING_SIZE;
@@ -25,6 +25,7 @@ const validate = (schema, option = {}) => (req, res, next) => {
     ...option
   });
   if (error) {
+    console.error("validate error", { error: error.message });
     res.status(400).json({ error: error.message });
     return;
   }

package/es/nft.js

@@ -0,0 +1,13 @@
+import get from "lodash/get";
+import last from "lodash/last";
+const getNftExpirationDate = (asset) => last(get(asset, "data.value.expirationDate", []));
+const isDateExpired = (expirationDate) => !!expirationDate && new Date(expirationDate).getTime() <= Date.now();
+const isNFTExpired = (asset) => {
+  const expirationDate = getNftExpirationDate(asset);
+  return isDateExpired(expirationDate);
+};
+export {
+  getNftExpirationDate,
+  isDateExpired,
+  isNFTExpired
+};

package/es/payment-kit.js

@@ -0,0 +1,4 @@
+const formatTimestamp = (timestamp) => new Date(timestamp * 1e3).toISOString();
+export {
+  formatTimestamp
+};

package/es/util.js

@@ -2,7 +2,7 @@ import "moment-timezone";
 import "moment/locale/zh-cn";
 import moment from "moment";
 import joinURL from "url-join";
-import get from "lodash.get";
+import get from "lodash/get";
 import { TIME_LOCALE, LAUNCH_STATUS } from "./constant";
 const formatPeriod = (duration) => {
   const value = Number(duration.slice(0, duration.length - 1));
@@ -75,7 +75,7 @@ const getContinueLaunchURL = ({ baseURL, launch }) => {
     return urlObject.href;
   }
   if (launch.status >= LAUNCH_STATUS.paid && launch.status < LAUNCH_STATUS.consuming) {
-    urlObject.pathname = joinURL(urlObject.pathname, `/launch/${launch.nftDid}`);
+    urlObject.pathname = joinURL(urlObject.pathname, `/launch/${launch._id}`);
     urlObject.searchParams.set("sessionId", launch._id);
     urlObject.searchParams.set("blocklet_meta_url", launch.blockletMetaUrl);
     urlObject.searchParams.set("launchType", launch.type);
@@ -105,15 +105,51 @@ const formatRegistryLogoPath = (did, asset) => {
   return `/assets/${did}/${asset}`;
 };
 const getBlockletLogoUrl = ({ did, baseUrl, logoPath }) => {
-  if (logoPath && logoPath.startsWith("http")) {
+  if (!logoPath) {
+    return "";
+  }
+  if (logoPath == null ? void 0 : logoPath.startsWith("http")) {
     return logoPath;
   }
-  if (baseUrl.startsWith("http") && logoPath) {
+  if ((baseUrl == null ? void 0 : baseUrl.startsWith("http")) && logoPath) {
     return joinURL(baseUrl, formatRegistryLogoPath(did, logoPath));
   }
   return "";
 };
+const getBlockletUrlOnStore = ({ did, baseUrl }) => {
+  try {
+    if (!baseUrl || !did) {
+      return "";
+    }
+    const url = new URL(baseUrl);
+    return joinURL(url.origin, `/blocklets/${did}`);
+  } catch (error) {
+    console.error("get registry url from blocklet meta url error:", error);
+    return "";
+  }
+};
+const getDefaultTrialEnd = () => moment().add(1, "years").unix();
+const util = {
+  formatPeriod,
+  prettyDurationUnit,
+  prettyDuration,
+  formatDatetime,
+  formatUtcDatetime,
+  isDateExpired,
+  sortArrayByDate,
+  getSort,
+  getExplorerUrl,
+  getBlockletDisplayName,
+  getBlockletAdminURL,
+  getContinueLaunchURL,
+  getBlockletMetaUrlFromQuery,
+  getRegistryUrlFromBlockletMetaUrl,
+  getBlockletLogoUrl,
+  getBlockletUrlOnStore,
+  getDefaultTrialEnd
+};
 export {
+  util as default,
   formatDatetime,
   formatPeriod,
   formatUtcDatetime,
@@ -121,7 +157,9 @@ export {
   getBlockletDisplayName,
   getBlockletLogoUrl,
   getBlockletMetaUrlFromQuery,
+  getBlockletUrlOnStore,
   getContinueLaunchURL,
+  getDefaultTrialEnd,
   getExplorerUrl,
   getRegistryUrlFromBlockletMetaUrl,
   getSort,

package/lib/constant.js

@@ -26,6 +26,7 @@ const LAUNCH_STATUS = Object.freeze({
   selected: 10,
   connected: 20,
   paid: 30,
+  nftMinted: 35,
   allocated: 40,
   consuming: 46,
   installed: 50,
@@ -34,6 +35,12 @@ const LAUNCH_STATUS = Object.freeze({
   timeout: 80,
   transferred: 90
 });
+const LAUNCH_SESSION_TYPE = Object.freeze({
+  serverless: "serverless",
+  dedicated: "dedicated",
+  onDemand: "on-demand"
+  // FIXME: on-demand 是兼容字段，未来该字段会被移除
+});
 const SERVERLESS_INSTANCE_STATUS = {
   launching: 10,
   running: 20,
@@ -57,6 +64,7 @@ const SERVER_ACTIVITY_TYPE = Object.freeze({
   launch: "launch",
   createFailed: "createFailed",
   created: "created",
+  modifiedInstanceType: "modifiedInstanceType",
   start: "start",
   started: "started",
   startFailed: "startFailed",
@@ -81,10 +89,12 @@ const toMap = (status) => Object.keys(status).reduce((acc, cur) => {
 const fromStatus = (map) => (status) => map[status];
 const statusInstanceMap = toMap(INSTANCE_STATUS);
 const planStatusMap = toMap(PLAN_STATUS);
+const launchStatusMap = toMap(LAUNCH_STATUS);
 const fromInstanceStatus = fromStatus(statusInstanceMap);
 const fromPlanStatus = fromStatus(planStatusMap);
+const fromLaunchStatus = fromStatus(launchStatusMap);
 const NFT_TYPE_SERVERLESS = "BlockletServerServerlessNFT";
-const BLOCKLET_SERVER_OWNERSHIP_NFT = "BlockletServerOwnershipNFT";
+const NFT_TYPE_DEDICATE = "BlockletServerOwnershipNFT";
 const TIME_LOCALE = {
   en: {
     h: "hour",
@@ -147,16 +157,22 @@ const CURRENCY_TYPE = {
   crypto: "crypto"
 };
 const SERVERLESS_RETAIN_DAYS = 30;
+const APP_RECORD_TYPE = {
+  install: "install",
+  uninstall: "uninstall"
+};
+exports.APP_RECORD_TYPE = APP_RECORD_TYPE;
 exports.APP_TYPE = APP_TYPE;
-exports.BLOCKLET_SERVER_OWNERSHIP_NFT = BLOCKLET_SERVER_OWNERSHIP_NFT;
 exports.CURRENCY_TYPE = CURRENCY_TYPE;
 exports.DID_DOMAIN_SUFFIX = DID_DOMAIN_SUFFIX;
 exports.INSTANCE_MAX_DESC_LENGTH = INSTANCE_MAX_DESC_LENGTH;
 exports.INSTANCE_MAX_NAME_LENGTH = INSTANCE_MAX_NAME_LENGTH;
 exports.INSTANCE_STATUS = INSTANCE_STATUS;
 exports.LAUNCH_ACTIVITY_TYPE = LAUNCH_ACTIVITY_TYPE;
+exports.LAUNCH_SESSION_TYPE = LAUNCH_SESSION_TYPE;
 exports.LAUNCH_STATUS = LAUNCH_STATUS;
 exports.LAUNCH_TYPE = LAUNCH_TYPE;
+exports.NFT_TYPE_DEDICATE = NFT_TYPE_DEDICATE;
 exports.NFT_TYPE_SERVERLESS = NFT_TYPE_SERVERLESS;
 exports.PAYMENT_METHODS = PAYMENT_METHODS;
 exports.PAYMENT_STATUS = PAYMENT_STATUS;
@@ -169,4 +185,5 @@ exports.SERVER_ACTIVITY_TYPE = SERVER_ACTIVITY_TYPE;
 exports.SKU_STATUS = SKU_STATUS;
 exports.TIME_LOCALE = TIME_LOCALE;
 exports.fromInstanceStatus = fromInstanceStatus;
+exports.fromLaunchStatus = fromLaunchStatus;
 exports.fromPlanStatus = fromPlanStatus;

package/lib/get-asset.js

@@ -1,7 +1,7 @@
 "use strict";
 const joinUrl = require("url-join");
 const axios = require("axios");
-const get = require("lodash.get");
+const get = require("lodash/get");
 const getAsset = async (chainHost, address) => {
   const url = joinUrl(new URL(chainHost).origin, "/api/gql/");
   const result = await axios.post(

package/lib/middleware.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const pick = require("lodash.pick");
+const pick = require("lodash/pick");
 const util = require("./util");
 const MAX_PAGING_SIZE = 100;
 const DEFAULT_PAGING_SIZE = MAX_PAGING_SIZE;
@@ -27,6 +27,7 @@ const validate = (schema, option = {}) => (req, res, next) => {
     ...option
   });
   if (error) {
+    console.error("validate error", { error: error.message });
     res.status(400).json({ error: error.message });
     return;
   }

package/lib/nft.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const get = require("lodash/get");
+const last = require("lodash/last");
+const getNftExpirationDate = (asset) => last(get(asset, "data.value.expirationDate", []));
+const isDateExpired = (expirationDate) => !!expirationDate && new Date(expirationDate).getTime() <= Date.now();
+const isNFTExpired = (asset) => {
+  const expirationDate = getNftExpirationDate(asset);
+  return isDateExpired(expirationDate);
+};
+exports.getNftExpirationDate = getNftExpirationDate;
+exports.isDateExpired = isDateExpired;
+exports.isNFTExpired = isNFTExpired;

package/lib/payment-kit.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const formatTimestamp = (timestamp) => new Date(timestamp * 1e3).toISOString();
+exports.formatTimestamp = formatTimestamp;

package/lib/util.js

@@ -1,10 +1,10 @@
 "use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 require("moment-timezone");
 require("moment/locale/zh-cn");
 const moment = require("moment");
 const joinURL = require("url-join");
-const get = require("lodash.get");
+const get = require("lodash/get");
 const constant = require("./constant");
 const formatPeriod = (duration) => {
   const value = Number(duration.slice(0, duration.length - 1));
@@ -77,7 +77,7 @@ const getContinueLaunchURL = ({ baseURL, launch }) => {
     return urlObject.href;
   }
   if (launch.status >= constant.LAUNCH_STATUS.paid && launch.status < constant.LAUNCH_STATUS.consuming) {
-    urlObject.pathname = joinURL(urlObject.pathname, `/launch/${launch.nftDid}`);
+    urlObject.pathname = joinURL(urlObject.pathname, `/launch/${launch._id}`);
     urlObject.searchParams.set("sessionId", launch._id);
     urlObject.searchParams.set("blocklet_meta_url", launch.blockletMetaUrl);
     urlObject.searchParams.set("launchType", launch.type);
@@ -107,14 +107,50 @@ const formatRegistryLogoPath = (did, asset) => {
   return `/assets/${did}/${asset}`;
 };
 const getBlockletLogoUrl = ({ did, baseUrl, logoPath }) => {
-  if (logoPath && logoPath.startsWith("http")) {
+  if (!logoPath) {
+    return "";
+  }
+  if (logoPath == null ? void 0 : logoPath.startsWith("http")) {
     return logoPath;
   }
-  if (baseUrl.startsWith("http") && logoPath) {
+  if ((baseUrl == null ? void 0 : baseUrl.startsWith("http")) && logoPath) {
     return joinURL(baseUrl, formatRegistryLogoPath(did, logoPath));
   }
   return "";
 };
+const getBlockletUrlOnStore = ({ did, baseUrl }) => {
+  try {
+    if (!baseUrl || !did) {
+      return "";
+    }
+    const url = new URL(baseUrl);
+    return joinURL(url.origin, `/blocklets/${did}`);
+  } catch (error) {
+    console.error("get registry url from blocklet meta url error:", error);
+    return "";
+  }
+};
+const getDefaultTrialEnd = () => moment().add(1, "years").unix();
+const util = {
+  formatPeriod,
+  prettyDurationUnit,
+  prettyDuration,
+  formatDatetime,
+  formatUtcDatetime,
+  isDateExpired,
+  sortArrayByDate,
+  getSort,
+  getExplorerUrl,
+  getBlockletDisplayName,
+  getBlockletAdminURL,
+  getContinueLaunchURL,
+  getBlockletMetaUrlFromQuery,
+  getRegistryUrlFromBlockletMetaUrl,
+  getBlockletLogoUrl,
+  getBlockletUrlOnStore,
+  getDefaultTrialEnd
+};
+exports.default = util;
 exports.formatDatetime = formatDatetime;
 exports.formatPeriod = formatPeriod;
 exports.formatUtcDatetime = formatUtcDatetime;
@@ -122,7 +158,9 @@ exports.getBlockletAdminURL = getBlockletAdminURL;
 exports.getBlockletDisplayName = getBlockletDisplayName;
 exports.getBlockletLogoUrl = getBlockletLogoUrl;
 exports.getBlockletMetaUrlFromQuery = getBlockletMetaUrlFromQuery;
+exports.getBlockletUrlOnStore = getBlockletUrlOnStore;
 exports.getContinueLaunchURL = getContinueLaunchURL;
+exports.getDefaultTrialEnd = getDefaultTrialEnd;
 exports.getExplorerUrl = getExplorerUrl;
 exports.getRegistryUrlFromBlockletMetaUrl = getRegistryUrlFromBlockletMetaUrl;
 exports.getSort = getSort;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-util",
-  "version": "2.2.54",
+  "version": "2.2.56",
   "description": "Common constants",
   "keywords": [
     "constant"
@@ -35,20 +35,19 @@
     "url": "https://github.com/blocklet/launcher/issues"
   },
   "dependencies": {
-    "@blocklet/sdk": "^1.16.23",
-    "@ocap/util": "^1.18.110",
+    "@blocklet/sdk": "^1.16.24",
+    "@ocap/util": "^1.18.113",
     "axios": "^0.27.2",
     "flat": "^5.0.2",
-    "lodash.get": "^4.4.2",
-    "lodash.pick": "^4.4.0",
+    "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.45",
     "url-join": "^4.0.1"
   },
   "devDependencies": {
     "jest": "^27.5.1",
-    "vite": "^5.0.12",
+    "vite": "^5.2.2",
     "vite-plugin-build": "^0.10.0"
   },
-  "gitHead": "cd8c9b12e0d4c89557cd76ce1dc89c5d14ed50e1"
+  "gitHead": "0386d6a9170c437800e7e892163787277df7a682"
 }