plutosdk 1.0.2-beta.4 → 1.0.2-beta.6

package/lib/components/Introduction/index.js

@@ -11,6 +11,6 @@ export default class Introduction extends PureComponent {
      *
      */
     render() {
-        return (_jsx(Fade, Object.assign({ in: true, timeout: { enter: 1000 } }, { children: _jsxs(Box, Object.assign({ sx: { width: 1, top: '6%', '@media (max-height: 570px)': { top: '2%' }, '@media (orientation: landscape)': { display: 'none' }, textAlign: 'center', position: 'absolute' } }, { children: [_jsx(CatAni, {}), _jsx(Box, Object.assign({ sx: { fontSize: 24, fontWeight: 'bold', color: '#764428' } }, { children: "Catizen" })), _jsx(Box, Object.assign({ sx: { m: '0 auto', width: 360, textAlign: 'center', wordWrap: 'break-word', fontSize: 18, fontWeight: 'bold', color: '#bc805e' } }, { children: "Catizen's Games:Play, Earn, Airdrop!" }))] })) })));
+        return (_jsx(Fade, Object.assign({ in: true, timeout: { enter: 1000 } }, { children: _jsxs(Box, Object.assign({ sx: { width: 1, top: '6%', '@media (max-height: 570px)': { top: '2%' }, '@media (max-height: 480px)': { display: 'none' }, textAlign: 'center', position: 'absolute' } }, { children: [_jsx(CatAni, {}), _jsx(Box, Object.assign({ sx: { fontSize: 24, fontWeight: 'bold', color: '#764428' } }, { children: "Catizen" })), _jsx(Box, Object.assign({ sx: { m: '0 auto', width: 360, textAlign: 'center', wordWrap: 'break-word', fontSize: 18, fontWeight: 'bold', color: '#bc805e' } }, { children: "Catizen's Games:Play, Earn, Airdrop!" }))] })) })));
     }
 }

package/lib/components/Purchase/index.d.ts

@@ -49,4 +49,12 @@ export default class Purchase extends PureComponent {
      *
      */
     onClickClose: () => void;
+    /**
+     *
+     */
+    showTokenPay(): boolean;
+    /**
+     *
+     */
+    showStarPay(): boolean;
 }

package/lib/components/Purchase/index.js

@@ -6,7 +6,7 @@ import Stack from '@mui/material/Stack';
 import PubSub from 'pubsub-js';
 import { CHAIN } from '@tonconnect/ui';
 import { CODE, CURRENCY, PS_PURCHASE_COMPLETED, PS_SWITCH_PAGE, PAGE_ID, PAY_TYPE, TOKEN_NAME } from '../../utils/constant';
-import { isAppleClient, onMobile } from '../../utils/Utils';
+import { onTelegramAndroid, onTelegramApple, onTelegramEnv } from '../../utils/Utils';
 import Config from '../../utils/Config';
 import user from '../../utils/User';
 import platform from '../../utils/Platform';
@@ -147,7 +147,7 @@ export default class Purchase extends PureComponent {
     render() {
         const { ton, tonOld, tonDiscount, usdt, usdtOld, usdtDiscount, cati, catiOld, catiDiscount, star, starOld, starDiscount } = user.purchaseData;
         const { showSlide } = this.state;
-        return (_jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative' } }, { children: [_jsx(BlurMask, {}), _jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative', overflowY: 'auto', scrollbarWidth: 'none !important', '::-webkit-scrollbar': { display: 'none !important' } } }, { children: [_jsx(Box, { sx: { width: 1, height: 1, position: 'fixed' }, onClick: this.onClickClose }), _jsx(Box, Object.assign({ sx: { width: '100%', position: 'absolute', pointerEvents: 'none', '@media (orientation: portrait)': { bottom: 20 }, '@media (orientation: landscape)': { top: 10 } } }, { children: _jsx(Slide, Object.assign({ direction: 'up', in: showSlide, mountOnEnter: true, unmountOnExit: true, timeout: { enter: 600, exit: 600 }, onExited: this.onExited }, { children: _jsxs(Box, Object.assign({ sx: { width: 1, maxWidth: 430, m: '0 auto', position: 'relative', pointerEvents: 'auto' } }, { children: [_jsx(ContentBg, {}), _jsx(ContentTitle, { title: 'Purchase' }), _jsx(PurchaseInfo, {}), _jsxs(Stack, Object.assign({ spacing: 2, sx: { mx: 5, pb: 4 } }, { children: [Config.TEST_MODE || (!onMobile() && !isAppleClient()) ? (_jsxs(_Fragment, { children: [_jsx(PayButton, { currency: CURRENCY.cati, price: cati, oldPrice: catiOld, discount: catiDiscount, onClickPay: this.onClickCati }), _jsx(PayButton, { currency: CURRENCY.ton, price: ton, oldPrice: tonOld, discount: tonDiscount, onClickPay: this.onClickTon }), _jsx(PayButton, { currency: CURRENCY.usdt, price: usdt, oldPrice: usdtOld, discount: usdtDiscount, onClickPay: this.onClickUsdt })] })) : null, _jsx(PayButton, { currency: CURRENCY.star, price: star, oldPrice: starOld, discount: starDiscount, onClickPay: this.onClickStar })] }))] })) })) }))] }))] })));
+        return (_jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative' } }, { children: [_jsx(BlurMask, {}), _jsxs(Box, Object.assign({ sx: { width: 1, height: 1, position: 'relative', overflowY: 'auto', scrollbarWidth: 'none !important', '::-webkit-scrollbar': { display: 'none !important' } } }, { children: [_jsx(Box, { sx: { width: 1, height: 1, position: 'fixed' }, onClick: this.onClickClose }), _jsx(Box, Object.assign({ sx: { width: '100%', position: 'absolute', pointerEvents: 'none', bottom: 20, '@media (max-height: 480px)': { top: 10 } } }, { children: _jsx(Slide, Object.assign({ direction: 'up', in: showSlide, mountOnEnter: true, unmountOnExit: true, timeout: { enter: 600, exit: 600 }, onExited: this.onExited }, { children: _jsxs(Box, Object.assign({ sx: { width: 1, maxWidth: 430, m: '0 auto', position: 'relative', pointerEvents: 'auto' } }, { children: [_jsx(ContentBg, {}), _jsx(ContentTitle, { title: 'Purchase' }), _jsx(PurchaseInfo, {}), _jsxs(Stack, Object.assign({ spacing: 2, sx: { mx: 5, pb: 4 } }, { children: [this.showTokenPay() ? (_jsxs(_Fragment, { children: [_jsx(PayButton, { currency: CURRENCY.cati, price: cati, oldPrice: catiOld, discount: catiDiscount, onClickPay: this.onClickCati }), _jsx(PayButton, { currency: CURRENCY.ton, price: ton, oldPrice: tonOld, discount: tonDiscount, onClickPay: this.onClickTon }), _jsx(PayButton, { currency: CURRENCY.usdt, price: usdt, oldPrice: usdtOld, discount: usdtDiscount, onClickPay: this.onClickUsdt })] })) : null, this.showStarPay() ? (_jsx(PayButton, { currency: CURRENCY.star, price: star, oldPrice: starOld, discount: starDiscount, onClickPay: this.onClickStar })) : null] }))] })) })) }))] }))] })));
     }
     /**
      *
@@ -188,4 +188,32 @@ export default class Purchase extends PureComponent {
             console.log(error.message);
         });
     }
+    /**
+     *
+     */
+    showTokenPay() {
+        if (Config.TEST_MODE) {
+            return true;
+        }
+        //
+        if (onTelegramApple()) {
+            return false;
+        }
+        //
+        if (onTelegramAndroid()) {
+            return false;
+        }
+        //
+        return true;
+    }
+    /**
+     *
+     */
+    showStarPay() {
+        if (!onTelegramEnv()) {
+            return false;
+        }
+        //
+        return true;
+    }
 }

package/lib/main.js

@@ -43,10 +43,6 @@ const start = () => {
  *
  */
 const run = () => {
-    //删除路径里Telegram参数
-    const baseUrl = location.origin + location.pathname + location.search;
-    history.replaceState(null, null, baseUrl);
-    //
     if (document.body) {
         start();
         return;

package/lib/sdk.d.ts

@@ -71,3 +71,16 @@ export declare const vibrate: (type: number) => void;
  * @param handler
  */
 export declare const onEvent: (type: string, handler: Function) => void;
+/**
+ *
+ */
+export declare const isDesktopEnabled: () => boolean;
+/**
+ *
+ * @param customLink
+ */
+export declare const openGameForWeb: (customLink?: string) => void;
+/**
+ *
+ */
+export declare const getCpCustomLink: () => string;

package/lib/sdk.js

@@ -1,6 +1,7 @@
 import PubSub from 'pubsub-js';
+import { Base64 } from 'base64-string';
 import { CODE, PAGE_ID, PS_APP_DID_MOUNT, PS_GAME_INFO_LOADED, PS_GAME_READY, PS_SWITCH_PAGE, EVENT_PURCHASE_COMPLETED, EVENT_CHECK_IN_COMPLETED } from './utils/constant';
-import { clipboard } from './utils/Utils';
+import { clipboard, onTelegramAndroid, onTelegramApple, onTelegramClient } from './utils/Utils';
 import Config from './utils/Config';
 import eventManager from './utils/EventManager';
 import user from './utils/User';
@@ -106,6 +107,25 @@ export const vibrate = (type) => {
 export const onEvent = (type, handler) => {
     sdk.onEvent(type, handler);
 };
+/**
+ *
+ */
+export const isDesktopEnabled = () => {
+    return sdk.isDesktopEnabled();
+};
+/**
+ *
+ * @param customLink
+ */
+export const openGameForWeb = (customLink = '') => {
+    sdk.openGameForWeb(customLink);
+};
+/**
+ *
+ */
+export const getCpCustomLink = () => {
+    return sdk.getCpCustomLink();
+};
 /**
  *
  */
@@ -426,6 +446,42 @@ class Sdk {
     vibrate(type) {
         platform.vibrate(type);
     }
+    /**
+     *
+     */
+    isDesktopEnabled() {
+        return onTelegramClient() && onTelegramApple() && onTelegramAndroid();
+    }
+    /**
+     *
+     * @param customLink
+     */
+    openGameForWeb(customLink) {
+        if (!this.isDesktopEnabled()) {
+            console.log(`openGameForWeb not support for web.`);
+            return;
+        }
+        //
+        if (!Config.GAME_URL) {
+            console.log('game url is null');
+            return;
+        }
+        //
+        const enc = new Base64();
+        const base64Data = enc.encode(Config.INIT_DATA);
+        const url = new URL(Config.GAME_URL);
+        url.searchParams.append('initdata', base64Data);
+        if (customLink) {
+            url.searchParams.append('pcplink', customLink);
+        }
+        platform.openLink(url.href);
+    }
+    /**
+     *
+     */
+    getCpCustomLink() {
+        return Config.CP_CUSTOM_LINK;
+    }
     /**
      *
      */

package/lib/utils/Platform.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { CODE, SHARE_TEXT } from './constant';
-import { onMobile } from "./Utils";
+import { onMobile, onTelegramClient } from "./Utils";
 import Config from "./Config";
 import Api from "./Api";
 import user from './User';
@@ -69,6 +69,7 @@ class Platform {
             let icon = user.icon = data['icon'];
             let ticket = data['ticket'];
             Config.TOKEN = data['token'];
+            Config.GAME_URL = data['gameurl'];
             return { plutoId, firstName, lastName, icon, ticket };
         });
     }
@@ -282,7 +283,7 @@ class Platform {
         let link = `${user.gameInfo.appUrl}?startapp=g_${Config.GAME_ID}_${user.plutoId}`;
         let text = encodeURIComponent(SHARE_TEXT[Config.GAME_ID] || SHARE_TEXT[1000]);
         let url = `https://t.me/share/url?url=${link}&text=${text}`;
-        if (onMobile()) {
+        if (onTelegramClient() && onMobile()) {
             this.openTelegramLink(url);
             return;
         }

package/lib/utils/Utils.d.ts

@@ -14,6 +14,22 @@ export declare const randRange: (min: number, max: number) => number;
  * @param name
  */
 export declare const getRes: (name: string) => string;
+/**
+ * 是否在Telegram小游戏环境
+ */
+export declare const onTelegramEnv: () => boolean;
+/**
+ * 是否在Telegram客户端版的小游戏环境
+ */
+export declare const onTelegramClient: () => boolean;
+/**
+ * 是否在苹果设备Telegram客户端版的小程序（Mac、iOS、padOS）
+ */
+export declare const onTelegramApple: () => boolean;
+/**
+ * 是否在安卓设备Telegram客户端版的小程序
+ */
+export declare const onTelegramAndroid: () => boolean;
 /**
  *
  */
@@ -21,7 +37,7 @@ export declare const onMobile: () => boolean;
 /**
  *
  */
-export declare const isAppleClient: () => boolean;
+export declare const onAppleClient: () => boolean;
 /**
  *
  * @param text

package/lib/utils/Utils.js

@@ -28,6 +28,47 @@ export const randRange = (min, max) => {
 export const getRes = (name) => {
     return `${Config.RES_URL}${name}`;
 };
+/**
+ * 是否在Telegram小游戏环境
+ */
+export const onTelegramEnv = () => {
+    const pf = Telegram.WebApp.platform;
+    const ver = Telegram.WebApp.version;
+    if (!pf || pf == 'unknown') {
+        return false;
+    }
+    //
+    if (!ver || ver == '6.0') {
+        return false;
+    }
+    //
+    return true;
+};
+/**
+ * 是否在Telegram客户端版的小游戏环境
+ */
+export const onTelegramClient = () => {
+    const pf = Telegram.WebApp.platform;
+    if (!pf || pf == 'unknown' || pf.includes('web')) {
+        return false;
+    }
+    //
+    return true;
+};
+/**
+ * 是否在苹果设备Telegram客户端版的小程序（Mac、iOS、padOS）
+ */
+export const onTelegramApple = () => {
+    const pf = Telegram.WebApp.platform || '';
+    return pf.includes('macos') || pf.includes('ios') || pf.includes('pados');
+};
+/**
+ * 是否在安卓设备Telegram客户端版的小程序
+ */
+export const onTelegramAndroid = () => {
+    const pf = Telegram.WebApp.platform || '';
+    return pf.includes('android');
+};
 /**
  *
  */
@@ -39,7 +80,7 @@ export const onMobile = () => {
 /**
  *
  */
-export const isAppleClient = () => {
+export const onAppleClient = () => {
     var _a, _b;
     const ua = new UAParser();
     const browserName = (_a = ua.getBrowser().name) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase();

package/lib/utils/config.d.ts

@@ -17,9 +17,10 @@ export default class Config {
     static BOT_NAME: string;
     static INIT_DATA: string;
     static TOKEN: string;
+    static GAME_URL: string;
+    static CP_CUSTOM_LINK: string;
     /**
      *
-     * @param initConfig
      */
     static init(): void;
 }

package/lib/utils/config.js

@@ -1,3 +1,4 @@
+import { Base64 } from "base64-string";
 //debug
 const API_URL_DEBUG = 'https://test-sdk1.pluto.vision/';
 const PAYLOAD_URL_DEBUG = 'https://test-bc1.pluto.vision/api/ton/getTokenPayload';
@@ -22,7 +23,6 @@ const TOKENS_JETTON_ADDRESS_RELEASE = {
 export default class Config {
     /**
      *
-     * @param initConfig
      */
     static init() {
         if (process.env.NODE_ENV == 'development') {
@@ -32,15 +32,41 @@ export default class Config {
             Config.INIT_DATA = process.env.REACT_APP_INIT_DATA;
         }
         else {
-            let urlParams = new URLSearchParams(location.search);
+            const urlParams = new URLSearchParams(location.search);
             Config.TEST_MODE = urlParams.get('debug') == '1';
             Config.GAME_ID = urlParams.get('gameid');
             Config.BOT_NAME = urlParams.get('botname');
-            Config.INIT_DATA = urlParams.get('initdata');
+            Config.CP_CUSTOM_LINK = urlParams.get('pcplink');
             //
-            if (!Config.INIT_DATA) {
-                Config.INIT_DATA = Telegram.WebApp.initData;
+            let initData = Telegram.WebApp.initData;
+            if (!initData) {
+                const enc = new Base64();
+                //initdata参数是在非Telegram环境时使用(此参数使用后会从url参数列表中删除)
+                //1、CP接入SDK时模拟测试账号（10001...10005）
+                //2、游戏运行在WEB端（由Telegram环境跳转到浏览器，将Telegram.WebApp.initData base64）
+                initData = urlParams.get('initdata');
+                //刷新时无法取到此参数，使用缓存
+                if (!initData) {
+                    initData = window.localStorage.getItem('PLUTO_INIT_DATA') || '';
+                }
+                //非测试账号
+                if (!initData.startsWith('10')) {
+                    initData = enc.decode(initData);
+                }
+                //刷新时使用
+                if (initData) {
+                    const base64Data = enc.encode(initData);
+                    window.localStorage.setItem('PLUTO_INIT_DATA', base64Data);
+                }
             }
+            //
+            Config.INIT_DATA = initData;
+            //删除url里Telegram hash参数和initdata
+            const baseUrl = window.location.origin + window.location.pathname + window.location.search;
+            const url = new URL(baseUrl);
+            url.searchParams.delete('initdata');
+            url.searchParams.delete('pcplink');
+            window.history.replaceState(null, null, url.href);
         }
         //
         if (Config.TEST_MODE) {
@@ -70,3 +96,7 @@ Config.BOT_NAME = '';
 Config.INIT_DATA = '';
 //
 Config.TOKEN = '';
+//
+Config.GAME_URL = '';
+//
+Config.CP_CUSTOM_LINK = '';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "plutosdk",
-    "version": "1.0.2-beta.4",
+    "version": "1.0.2-beta.6",
     "author": "pluto",
     "main": "./lib/index.js",
     "files": [
@@ -15,6 +15,7 @@
         "@mui/material": "^5.16.4",
         "@tonconnect/ui": "^2.0.9",
         "axios": "^1.7.4",
+        "base64-string": "^1.1.3",
         "pubsub-js": "^1.9.4",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",