@nakamura-123/pages 0.1.50 → 0.1.51

package/dist/component/Coin/CoinFnc.d.ts

@@ -1,6 +1,7 @@
-import RNIap, { ProductPurchase } from "react-native-iap";
+import RNIap, { ProductPurchase, Purchase } from "expo-iap";
 import { Storage } from "@nakamura-123/types";
 export declare const initializeIAP: (paymentItems: string[] | undefined, setProducts: (products: RNIap.Product[]) => void, setLoading: (loading: boolean) => void) => Promise<void>;
 export declare const handlePurchase: (productId: string, dispatch: (action: any) => void) => Promise<ProductPurchase | null>;
 export declare const restorePurchases: (dispatch: (action: any) => void, isAlert?: boolean) => Promise<Storage.Receipt[] | null>;
 export declare const updateAllFreeState: (receipt: Storage.Receipt | null) => (dispatch: any, getState: any) => void;
+export declare const getAndroidPurchaseState: (purchase: Purchase) => "paid" | "canceled" | "waiting";

package/dist/component/Coin/CoinFnc.js

@@ -36,9 +36,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateAllFreeState = exports.restorePurchases = exports.handlePurchase = exports.initializeIAP = void 0;
+exports.getAndroidPurchaseState = exports.updateAllFreeState = exports.restorePurchases = exports.handlePurchase = exports.initializeIAP = void 0;
 var react_native_1 = require("react-native");
-var react_native_iap_1 = require("react-native-iap");
+var expo_iap_1 = require("expo-iap");
 var stores_1 = require("@nakamura-123/stores");
 var ReceiptFnc_1 = require("./ReceiptFnc");
 // const { pushCoinLog, pushCoinError, pushCoinWarn } = errorAction;
@@ -49,14 +49,14 @@ var initializeIAP = function (paymentItems, setProducts, setLoading) { return __
         switch (_a.label) {
             case 0:
                 _a.trys.push([0, 5, 6, 7]);
-                return [4 /*yield*/, (0, react_native_iap_1.initConnection)()];
+                return [4 /*yield*/, (0, expo_iap_1.initConnection)()];
             case 1:
                 result = _a.sent();
                 console.log("IAP Connection Initialized: ", result);
                 itemSkus = paymentItems || [];
                 console.log("Item SKUs: ", itemSkus);
                 if (!(itemSkus.length > 0)) return [3 /*break*/, 3];
-                return [4 /*yield*/, (0, react_native_iap_1.getProducts)({ skus: itemSkus })];
+                return [4 /*yield*/, (0, expo_iap_1.requestProducts)({ skus: itemSkus })];
             case 2:
                 productList = _a.sent();
                 console.log("Product List: ", productList);
@@ -80,16 +80,15 @@ var initializeIAP = function (paymentItems, setProducts, setLoading) { return __
 exports.initializeIAP = initializeIAP;
 // 11. 購入処理
 var handlePurchase = function (productId, dispatch) { return __awaiter(void 0, void 0, void 0, function () {
-    var params, purchase, receipt, isValid, err_2;
+    var purchase, receipt, isValid, err_2;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                params = react_native_1.Platform.OS === "ios" ? { sku: productId } : { skus: [productId] };
-                _a.label = 1;
+                _a.trys.push([0, 5, , 6]);
+                return [4 /*yield*/, (0, expo_iap_1.requestPurchase)({
+                        request: { ios: { sku: productId }, android: { skus: [productId] } },
+                    })];
             case 1:
-                _a.trys.push([1, 6, , 7]);
-                return [4 /*yield*/, (0, react_native_iap_1.requestPurchase)(params)];
-            case 2:
                 purchase = _a.sent();
                 // dispatch(pushCoinLog({ title: "Purchase", log: purchase }));
                 if (Array.isArray(purchase))
@@ -113,16 +112,17 @@ var handlePurchase = function (productId, dispatch) { return __awaiter(void 0, v
                     // );
                     throw new Error("購入検証に失敗しました");
                 }
-                if (!(react_native_1.Platform.OS === "android" && purchase.purchaseStateAndroid === 2)) return [3 /*break*/, 3];
+                if (!(react_native_1.Platform.OS === "android" &&
+                    (0, exports.getAndroidPurchaseState)(purchase) === "waiting")) return [3 /*break*/, 2];
                 alert("手続きが完了しました。支払いが完了したら、このページにある「以前購入した方はこちらから復元」をタップしてください。");
-                return [3 /*break*/, 5];
-            case 3: return [4 /*yield*/, (0, react_native_iap_1.finishTransaction)({ purchase: purchase, isConsumable: false })];
-            case 4:
+                return [3 /*break*/, 4];
+            case 2: return [4 /*yield*/, (0, expo_iap_1.finishTransaction)({ purchase: purchase, isConsumable: false })];
+            case 3:
                 _a.sent();
                 alert("購入が完了しました！");
-                _a.label = 5;
-            case 5: return [2 /*return*/, purchase]; // 成功時に購入データを返す
-            case 6:
+                _a.label = 4;
+            case 4: return [2 /*return*/, purchase]; // 成功時に購入データを返す
+            case 5:
                 err_2 = _a.sent();
                 // エラー処理を整理
                 // dispatch(
@@ -130,7 +130,7 @@ var handlePurchase = function (productId, dispatch) { return __awaiter(void 0, v
                 // );
                 alert("購入に失敗しました。\nしばらく時間を置いた後、もう一度実行してみてください。もしそれでも購入できない場合は「よくある質問」をご確認いただくか、必要に応じて「お問い合わせフォーム」からご連絡ください。");
                 return [2 /*return*/, null]; // 失敗時はnullを返す
-            case 7: return [2 /*return*/];
+            case 6: return [2 /*return*/];
         }
     });
 }); };
@@ -143,9 +143,10 @@ var restorePurchases = function (dispatch, isAlert) { return __awaiter(void 0, v
             case 0:
                 _a.trys.push([0, 8, , 9]);
                 console.log("restorePurchases");
-                return [4 /*yield*/, (0, react_native_iap_1.getAvailablePurchases)()];
+                return [4 /*yield*/, (0, expo_iap_1.getAvailablePurchases)()];
             case 1:
                 purchases = _a.sent();
+                // const purchases: Purchase[] = await getAvailablePurchases();
                 console.log("purchases", purchases);
                 receipts = [];
                 _i = 0, purchases_1 = purchases;
@@ -158,8 +159,8 @@ var restorePurchases = function (dispatch, isAlert) { return __awaiter(void 0, v
                     dispatch((0, exports.updateAllFreeState)(receipt));
                     receipts.push(receipt);
                 }
-                if (!checkNeedFinish(purchase)) return [3 /*break*/, 4];
-                return [4 /*yield*/, (0, react_native_iap_1.finishTransaction)({ purchase: purchase, isConsumable: false })];
+                if (!checkIsAcknowledgedAndroid(purchase)) return [3 /*break*/, 4];
+                return [4 /*yield*/, (0, expo_iap_1.finishTransaction)({ purchase: purchase, isConsumable: false })];
             case 3:
                 _a.sent();
                 _a.label = 4;
@@ -211,7 +212,27 @@ var updateAllFreeState = function (receipt) { return function (dispatch, getStat
     }
 }; };
 exports.updateAllFreeState = updateAllFreeState;
-// 92. androidの後払いアイテムの承認をするか否か
-var checkNeedFinish = function (purchase) {
-    return purchase.purchaseStateAndroid === 1 && !purchase.isAcknowledgedAndroid;
+// 93. purchaseStateAndroidの判定(0: 支払済み, 1: キャンセル, 2: 支払い待ち)
+var getAndroidPurchaseState = function (purchase) {
+    if (purchase.platform === "ios") {
+        return "paid";
+    }
+    switch (purchase.purchaseStateAndroid) {
+        case 0:
+            return "paid";
+        case 1:
+            return "canceled";
+        case 2:
+            return "waiting";
+        default:
+            return "paid";
+    }
+};
+exports.getAndroidPurchaseState = getAndroidPurchaseState;
+// 94. Androidの後払いアイテムの承認をするか否か
+var checkIsAcknowledgedAndroid = function (purchase) {
+    if (purchase.platform === "ios")
+        return true; // iOSでは常に承認済み
+    return ((0, exports.getAndroidPurchaseState)(purchase) === "paid" &&
+        !purchase.isAcknowledgedAndroid);
 };

package/dist/component/Coin/CoinPageComponent.d.ts

@@ -1,15 +1,15 @@
 import React from "react";
-import RNIap from "react-native-iap";
+import { type Product } from "expo-iap";
 import { Nav } from "@nakamura-123/types";
 import { Comment } from "./AppReviews";
 interface Props {
     navigation: Nav.NavigationProp<"Coin">;
     comments: Comment[];
-    products: RNIap.Product[];
+    products: Product[];
     onPurchase: (productId: string) => void;
     onRestore: () => void;
     loading: boolean;
     isAllfreePaid: boolean;
 }
-declare const CoinPage: React.FC<Props>;
-export default CoinPage;
+declare const CoinPageComponent: React.FC<Props>;
+export default CoinPageComponent;

package/dist/component/Coin/CoinPageComponent.js

@@ -12,7 +12,7 @@ var Recommend_1 = __importDefault(require("./Recommend"));
 var AppReviews_1 = __importDefault(require("./AppReviews"));
 var WaitingPayBanner_1 = __importDefault(require("./WaitingPayBanner"));
 var react_i18next_1 = require("react-i18next");
-var CoinPage = function (_a) {
+var CoinPageComponent = function (_a) {
     var navigation = _a.navigation, comments = _a.comments, products = _a.products, onPurchase = _a.onPurchase, onRestore = _a.onRestore, loading = _a.loading, isAllfreePaid = _a.isAllfreePaid;
     var t = (0, react_i18next_1.useTranslation)().t;
     var isAndroid = react_native_1.Platform.OS === "android";
@@ -25,12 +25,10 @@ var CoinPage = function (_a) {
         <WaitingPayBanner_1.default currentPage="coin"/>
 
         {products.map(function (product, index) {
-            var name = isAndroid ? product.name : product.title;
-            var price = product.localizedPrice;
+            var name = isAndroid ? product.displayName : product.title;
+            var price = product.displayPrice;
             var title = "".concat(name, " ").concat(price);
-            return (<common_1.RectangleCard key={index} title={title} note={product.description} left={<common_1.IconInCircle name="gift"/>} color={isAllfreePaid ? "ltBlack" : "blue"} onPress={function () {
-                    return isAllfreePaid ? null : onPurchase(product.productId);
-                }}/>);
+            return (<common_1.RectangleCard key={index} title={title} note={product.description} left={<common_1.IconInCircle name="gift"/>} color={isAllfreePaid ? "ltBlack" : "blue"} onPress={function () { return (isAllfreePaid ? null : onPurchase(product.id)); }}/>);
         })}
         <react_native_1.View style={styles.txtContainer}>
           <common_1.MyText fsize="sm" color="gray">
@@ -71,4 +69,4 @@ var styles = react_native_1.StyleSheet.create({
         alignItems: "center",
     },
 });
-exports.default = CoinPage;
+exports.default = CoinPageComponent;

package/dist/component/Coin/ReceiptFnc.d.ts

@@ -1,6 +1,6 @@
-import { ProductPurchase } from "react-native-iap";
+import { type Purchase } from "expo-iap";
 import { Storage } from "@nakamura-123/types";
 type Receipt = Storage.Receipt;
-export declare const unifyReceipt: (receipt: ProductPurchase) => Receipt | null;
+export declare const unifyReceipt: (receipt: Purchase) => Receipt | null;
 export declare const validatePurchaseClientSide: (receipt: string | undefined, platform: "ios" | "android") => boolean;
 export {};

package/dist/component/Coin/ReceiptFnc.js

@@ -1,17 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePurchaseClientSide = exports.unifyReceipt = void 0;
-var react_native_1 = require("react-native");
 // 01. レシートの形式を統一
 var unifyReceipt = function (receipt) {
-    var os = react_native_1.Platform.OS;
-    return {
-        transactionId: receipt.transactionId || "",
-        productId: receipt.productId,
-        transactionDate: Number(receipt.transactionDate),
-        receipt: os === "ios" ? receipt.transactionReceipt : receipt.purchaseToken,
-        isPaid: os === "ios" || receipt.purchaseStateAndroid === 1, // iOSでは即時完了、AndroidはpurchaseStateが1が支払済み、2が未払い
-    };
+    if (receipt.platform === "android")
+        return {
+            transactionId: receipt.transactionId || "",
+            productId: receipt.productId,
+            transactionDate: Number(receipt.transactionDate),
+            receipt: receipt.purchaseToken || "",
+            isPaid: receipt.purchaseStateAndroid === 0,
+        };
+    else
+        return {
+            transactionId: receipt.transactionId || "",
+            productId: receipt.productId,
+            transactionDate: Number(receipt.transactionDate),
+            receipt: receipt.transactionReceipt || "",
+            isPaid: true, // iOSでは即時完了
+        };
 };
 exports.unifyReceipt = unifyReceipt;
 // 02. レシートの検証

package/dist/page/CoinPage.js

@@ -65,7 +65,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importStar(require("react"));
 var react_redux_1 = require("react-redux");
 var stores_1 = require("@nakamura-123/stores");
-var react_native_iap_1 = require("react-native-iap");
+// import RNIap, { endConnection } from "react-native-iap";
+var expo_iap_1 = require("expo-iap");
 var CoinPageComponent_1 = __importDefault(require("../component/Coin/CoinPageComponent"));
 var CoinFnc_1 = require("../component/Coin/CoinFnc");
 var ReceiptFnc_1 = require("../component/Coin/ReceiptFnc");
@@ -84,7 +85,7 @@ var CoinPage = function (_a) {
         (0, CoinFnc_1.initializeIAP)(items, setProducts, setLoading);
         // アンマウント時に接続を終了
         return function () {
-            (0, react_native_iap_1.endConnection)();
+            (0, expo_iap_1.endConnection)();
         };
     }, []);
     // 02.購入時の処理の実行