@blocklet/launcher-util 2.1.15 → 2.1.16

package/lib/constant.js

@@ -57,6 +57,7 @@ const SERVERLESS_INSTANCE_STATUS = {
   launching: 10,
   running: 20,
   expired: 30,
+  terminated: 40,
 };
 
 const toMap = (staus) =>
@@ -76,6 +77,29 @@ const fromPlanStatus = fromStatus(planStatusMap);
 const NFT_TYPE_SERVERLESS = 'BlockletServerServerlessNFT';
 const BLOCKLET_SERVER_OWNERSHIP_NFT = 'BlockletServerOwnershipNFT';
 
+const TIME_LOCALE = {
+  en: {
+    h: 'hour',
+    hs: 'hours',
+    d: ' day',
+    ds: ' days',
+    m: ' month',
+    ms: ' months',
+    y: ' year',
+    ys: ' years',
+  },
+  zh: {
+    h: '小时',
+    hs: '小时',
+    d: '天',
+    ds: '天',
+    m: '个月',
+    ms: '个月',
+    y: '年',
+    ys: '年',
+  },
+};
+
 module.exports = Object.freeze({
   SKU_STATUS: Object.freeze({
     DISABLED: 0,
@@ -122,4 +146,5 @@ module.exports = Object.freeze({
   SERVERLESS_INSTANCE_STATUS,
   LAUNCH_STATUS,
   SERVERLESS_RETAIN_DAYS: 30,
+  TIME_LOCALE,
 });

package/lib/util.js

@@ -1,8 +1,10 @@
 require('moment-timezone');
+require('moment/locale/zh-cn');
 const moment = require('moment');
 const joinURL = require('url-join');
 const get = require('lodash.get');
 const { BN, fromUnitToToken, fromTokenToUnit } = require('@ocap/util');
+const { TIME_LOCALE } = require('./constant');
 
 const calculatePrice = (duration, unitPrice, from) => {
   // eslint-disable-next-line no-param-reassign
@@ -17,25 +19,6 @@ const calculatePrice = (duration, unitPrice, from) => {
   return Number(fromUnitToToken(total).toString());
 };
 
-const DURATION_LOCALE = {
-  en: {
-    d: ' day',
-    ds: ' days',
-    m: ' month',
-    ms: ' months',
-    y: ' year',
-    ys: ' years',
-  },
-  zh: {
-    d: '天',
-    ds: '天',
-    m: '个月',
-    ms: '个月',
-    y: '年',
-    ys: '年',
-  },
-};
-
 const formatPeriod = (duration) => {
   const value = Number(duration.slice(0, duration.length - 1));
   const unit = duration[duration.length - 1];
@@ -44,13 +27,13 @@ const formatPeriod = (duration) => {
 };
 
 const prettyDurationUnit = ({ value, unit }, locale) => {
-  if (!Object.keys(DURATION_LOCALE).includes(locale)) {
+  if (!Object.keys(TIME_LOCALE).includes(locale)) {
     // eslint-disable-next-line no-param-reassign
     locale = 'en';
   }
 
   const localeKey = value > 1 ? `${unit}s` : unit;
-  return DURATION_LOCALE[locale][localeKey.toLowerCase()];
+  return TIME_LOCALE[locale][localeKey.toLowerCase()];
 };
 
 const prettyDuration = ({ value, unit }, locale) => {
@@ -115,6 +98,8 @@ const getBlockletDisplayName = (blocklet) => get(blocklet, 'title') || get(block
 
 const getBlockletAdminURL = (appURL) => joinURL(appURL, '/.well-known/service/admin/overview');
 
+const isDateExpired = (expirationDate) => !!expirationDate && new Date(expirationDate).getTime() <= Date.now();
+
 module.exports = {
   formatPeriod,
   calculatePrice,
@@ -122,8 +107,9 @@ module.exports = {
   prettyDuration,
   formatDatetime,
   formatUtcDatetime,
-  getSort,
+  isDateExpired,
   sortArrayByDate,
+  getSort,
   getExplorerUrl,
   getBlockletDisplayName,
   getBlockletAdminURL,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-util",
-  "version": "2.1.15",
+  "version": "2.1.16",
   "description": "Common constants",
   "keywords": [
     "constant"
@@ -46,5 +46,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "b6217d4c67d6a13bcca43d5d56e30960eba2ede0"
+  "gitHead": "f0dd5911eb4cb82e77834487caf061b6e2fd562b"
 }