@nakamura-123/pages 1.0.0 → 1.0.2

package/dist/component/Coin/CoinCheck.js

@@ -37,8 +37,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isCheckRequired = exports.coinCheckFnc = void 0;
-var lib_1 = require("@nakamura-123/lib");
 var toolkit_1 = require("@reduxjs/toolkit");
+// import { initConnection } from "expo-iap";
+var lib_1 = require("@nakamura-123/lib");
 var CoinFnc_1 = require("./CoinFnc");
 var stores_1 = require("@nakamura-123/stores");
 // 00.メイン関数

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

@@ -1,7 +1,7 @@
 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 initializeIAP: (paymentItems: string[] | undefined, setProducts?: (products: RNIap.Product[]) => void, setLoading?: (loading: boolean) => void) => Promise<void>;
+export declare const handlePurchase: (productId: string) => 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";
+export declare const getAndroidPurchaseState: (purchase: Purchase) => "paid" | "canceled" | "wait";

package/dist/component/Coin/CoinFnc.js

@@ -60,7 +60,7 @@ var initializeIAP = function (paymentItems, setProducts, setLoading) { return __
             case 2:
                 productList = _a.sent();
                 console.log("Product List: ", productList);
-                setProducts(productList);
+                setProducts && setProducts(productList);
                 return [3 /*break*/, 4];
             case 3:
                 console.warn("No SKUs provided.");
@@ -71,7 +71,7 @@ var initializeIAP = function (paymentItems, setProducts, setLoading) { return __
                 console.warn("IAP Initialization Error: ", err_1);
                 return [3 /*break*/, 7];
             case 6:
-                setLoading(false);
+                setLoading && setLoading(false);
                 return [7 /*endfinally*/];
             case 7: return [2 /*return*/];
         }
@@ -79,7 +79,7 @@ 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 handlePurchase = function (productId) { return __awaiter(void 0, void 0, void 0, function () {
     var purchase, receipt, isValid, err_2;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -95,25 +95,18 @@ var handlePurchase = function (productId, dispatch) { return __awaiter(void 0, v
                     purchase = purchase[0];
                 // 購入データの検証
                 if (!purchase) {
-                    // dispatch(pushCoinWarn({ title: "購入応答がありません", log: purchase }));
                     throw new Error("無効な購入応答");
                 }
                 receipt = purchase.transactionReceipt || purchase.purchaseToken;
                 if (!receipt) {
-                    // dispatch(
-                    //   pushCoinWarn({ title: "レシートが取得できません", log: purchase })
-                    // );
                     throw new Error("レシートデータが無効です");
                 }
                 isValid = (0, ReceiptFnc_1.validatePurchaseClientSide)(receipt, react_native_1.Platform.OS);
                 if (!isValid) {
-                    // dispatch(
-                    //   pushCoinWarn({ title: "購入検証に失敗しました", log: purchase })
-                    // );
                     throw new Error("購入検証に失敗しました");
                 }
                 if (!(react_native_1.Platform.OS === "android" &&
-                    (0, exports.getAndroidPurchaseState)(purchase) === "waiting")) return [3 /*break*/, 2];
+                    (0, exports.getAndroidPurchaseState)(purchase) === "wait")) return [3 /*break*/, 2];
                 alert("手続きが完了しました。支払いが完了したら、このページにある「以前購入した方はこちらから復元」をタップしてください。");
                 return [3 /*break*/, 4];
             case 2: return [4 /*yield*/, (0, expo_iap_1.finishTransaction)({ purchase: purchase, isConsumable: false })];
@@ -142,11 +135,10 @@ var restorePurchases = function (dispatch, isAlert) { return __awaiter(void 0, v
         switch (_a.label) {
             case 0:
                 _a.trys.push([0, 8, , 9]);
-                console.log("restorePurchases");
+                console.log("restorePurchases復元中:");
                 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;
@@ -218,21 +210,19 @@ var getAndroidPurchaseState = function (purchase) {
         return "paid";
     }
     switch (purchase.purchaseStateAndroid) {
-        case 0:
-            return "paid";
         case 1:
-            return "canceled";
+            return "paid";
         case 2:
-            return "waiting";
+            return "wait";
         default:
-            return "paid";
+            return "canceled";
     }
 };
 exports.getAndroidPurchaseState = getAndroidPurchaseState;
 // 94. Androidの後払いアイテムの承認をするか否か
 var checkIsAcknowledgedAndroid = function (purchase) {
     if (purchase.platform === "ios")
-        return true; // iOSでは常に承認済み
+        return false; // iOSでは常に未承認（finishは自動で行われる）
     return ((0, exports.getAndroidPurchaseState)(purchase) === "paid" &&
         !purchase.isAcknowledgedAndroid);
 };

package/dist/component/Coin/ReceiptFnc.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePurchaseClientSide = exports.unifyReceipt = void 0;
 // 01. レシートの形式を統一
 var unifyReceipt = function (receipt) {
-    var os = receipt.platform === "ios" ? "ios" : "android";
+    console.log("Unifying receipt:", receipt);
     if (receipt.platform === "android")
         return {
             transactionId: receipt.transactionId || "",
             productId: receipt.productId,
             transactionDate: Number(receipt.transactionDate),
             receipt: receipt.purchaseToken || "",
-            isPaid: receipt.purchaseStateAndroid === 0,
+            isPaid: receipt.purchaseStateAndroid === 1,
         };
     else
         return {
@@ -31,28 +31,34 @@ var validatePurchaseClientSide = function (receipt, platform) {
             return false;
         }
         // 2. プラットフォーム特有のチェック
-        if (platform === "android") {
-            // Android特有のチェック（例: レシートがJSON形式でない場合など）
-            try {
-                var parsedReceipt = JSON.parse(receipt);
-                if (!parsedReceipt.purchaseToken ||
-                    typeof parsedReceipt.purchaseToken !== "string") {
-                    console.error("購入データが無効です: purchaseTokenがありません");
-                    return false;
-                }
-            }
-            catch (_a) {
-                console.error("購入データが無効です: レシートの形式が不正です (JSONである必要があります)");
-                return false;
-            }
-        }
-        if (platform === "ios") {
-            // iOS特有のチェック
-            if (!/^[A-Za-z0-9+/=]+$/.test(receipt)) {
-                console.error("購入データが無効です: レシートがBase64形式ではありません");
-                return false;
-            }
-        }
+        // if (platform === "android") {
+        //   // Android特有のチェック（例: レシートがJSON形式でない場合など）
+        //   try {
+        //     const parsedReceipt = JSON.parse(receipt);
+        //     if (
+        //       !parsedReceipt.purchaseToken ||
+        //       typeof parsedReceipt.purchaseToken !== "string"
+        //     ) {
+        //       console.error("購入データが無効です: purchaseTokenがありません");
+        //       return false;
+        //     }
+        //   } catch {
+        //     console.error(
+        //       "購入データが無効です: レシートの形式が不正です (JSONである必要があります)"
+        //     );
+        //     return false;
+        //   }
+        // }
+        // iOSは、もうこの形式ではなくJSON形式なので、これは当てはまらない。
+        // if (platform === "ios") {
+        //   // iOS特有のチェック
+        //   if (!/^[A-Za-z0-9+/=]+$/.test(receipt)) {
+        //     console.error(
+        //       "購入データが無効です: レシートがBase64形式ではありません"
+        //     );
+        //     return false;
+        //   }
+        // }
         console.log("クライアントサイドの簡易検証が成功しました");
         return true;
     }

package/dist/component/Coin/WaitingPayBanner.js

@@ -12,6 +12,7 @@ var WaitingPayBanner = function (_a) {
     var currentPage = _a.currentPage;
     var msg = currentPage === "home" ? homeMsg : coinMsg;
     var allFreeState = (0, react_redux_1.useSelector)(function (state) { return state.setting.payment.allFreeState; });
+    console.log(allFreeState);
     if (allFreeState !== "wait")
         return null;
     return <common_1.ModalBanner bannerMsg={msg}/>;

package/dist/hooks/ExitQuizHook.js

@@ -25,14 +25,11 @@ var useConfirmExit = function (navigation) {
             showExitConfirmation(function () { return navigation.goBack(); }, onSaveProgress, removeSave);
             return true; // デフォルトの戻る挙動を無効化
         };
-        // ここがポイント：subscription を受け取る
-        var subscription = react_native_1.BackHandler.addEventListener("hardwareBackPress", onBackPress);
-        // cleanup で subscription.remove() を呼ぶ
+        react_native_1.BackHandler.addEventListener("hardwareBackPress", onBackPress);
         return function () {
-            subscription.remove();
+            return react_native_1.BackHandler.removeEventListener("hardwareBackPress", onBackPress);
         };
-    }, [navigation, onSaveProgress, removeSave]) // 依存を入れて stale 回避
-    );
+    }, []));
 };
 exports.useConfirmExit = useConfirmExit;
 // 確認ダイアログを表示する関数

package/dist/page/CoinPage.js

@@ -98,7 +98,7 @@ var CoinPage = function (_a) {
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 6, 7, 8]);
-                    return [4 /*yield*/, (0, CoinFnc_1.handlePurchase)(productId, dispatch)];
+                    return [4 /*yield*/, (0, CoinFnc_1.handlePurchase)(productId)];
                 case 2:
                     purchase = _a.sent();
                     if (!purchase) {

package/dist/page/HomePage.d.ts

@@ -3,7 +3,6 @@ import { Home, Nav } from "@nakamura-123/types";
 interface Prop {
     menuLists: Home.MenuListItem[];
     navigation: Nav.NavigationProp<"Home">;
-    t: (key: string) => string;
 }
 declare const HomePage: React.FC<Prop>;
 export default HomePage;

package/dist/page/HomePage.js

@@ -67,6 +67,7 @@ var react_native_1 = require("react-native");
 var realm_1 = __importDefault(require("realm"));
 var react_redux_1 = require("react-redux");
 var react_2 = require("@realm/react");
+var react_i18next_1 = require("react-i18next");
 var i18next_1 = __importDefault(require("i18next"));
 var common_1 = require("@nakamura-123/common");
 var stores_1 = require("@nakamura-123/stores");
@@ -87,26 +88,22 @@ var MenuRectangle = function (_a) {
 };
 var LOAD_OLD_MSG = "  旧システムのデータ引き継ぎを実施いたします。ふせんデータや模擬試験の成績など、可能な限りデータを移行いたしますが、仕様上一部移行ができない項目があります。あらかじめご了承ください。\n\n  なお、引き継ぎをキャンセルされた場合でも、設定ページより再度操作を行うことが可能です。";
 var HomePage = function (_a) {
-    var menuLists = _a.menuLists, navigation = _a.navigation, t = _a.t;
+    var menuLists = _a.menuLists, navigation = _a.navigation;
     var dispatch = (0, react_redux_1.useDispatch)();
     var DailyLogDB = (0, react_2.useQuery)(db_1.DailyLogSchema);
     // ここは、データの引き継ぎを行うための処理です。
     var realm = (0, react_2.useRealm)();
-    // const { t } = useTranslation();
+    var t = (0, react_i18next_1.useTranslation)().t;
     var showLoadOldData = (0, react_redux_1.useSelector)(function (state) { return state.setting.guide.loadOldData; });
     var settingAsyncLoaded = (0, react_redux_1.useSelector)(function (state) { return state.setting.asyncLoaded; });
     var oldInfo = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.oldInfo; });
     var isJLPT = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.setting.appSystem; }) === "JLPT";
-    // let language = useSelector((state: RootState) => state.setting.language);
-    // language = isJLPT ? language : "ja"; // JLPTの時は、jaにする。
+    var language = (0, react_redux_1.useSelector)(function (state) { return state.setting.language; });
+    language = isJLPT ? language : "ja"; // JLPTの時は、jaにする。
     (0, react_1.useEffect)(function () {
-        console.log("18next");
-        console.log(i18next_1.default);
-        console.log("t");
-        console.log(t("home.updateMsg"));
         if (!settingAsyncLoaded)
             return;
-        // i18next.changeLanguage(language); // 言語を切り替える
+        i18next_1.default.changeLanguage(language); // 言語を切り替える
         if (!showLoadOldData)
             return;
         dispatch({ type: "setting/guideStateFalse", payload: "loadOldData" });

package/dist/page/ResultPage.js

@@ -22,12 +22,49 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importStar(require("react"));
 var react_native_1 = require("react-native");
+var expo_iap_1 = require("expo-iap");
 var common_1 = require("@nakamura-123/common");
 var CharaCard_1 = __importDefault(require("../component/Result/CharaCard"));
 var LessonTitle_1 = __importDefault(require("../component/Result/LessonTitle"));
@@ -39,6 +76,7 @@ var CoinCheck_1 = require("../component/Coin/CoinCheck");
 var lib_1 = require("@nakamura-123/lib");
 var react_i18next_1 = require("react-i18next");
 var AdCard_1 = __importDefault(require("../component/Result/AdCard"));
+var CoinFnc_1 = require("../component/Coin/CoinFnc");
 var ResultPage = function (_a) {
     var navigation = _a.navigation;
     var dispatch = (0, react_redux_1.useDispatch)();
@@ -47,15 +85,61 @@ var ResultPage = function (_a) {
     var _b = (0, react_redux_1.useSelector)(function (state) { return state.setting.payment; }), allFreeState = _b.allFreeState, lastCheckedDate = _b.lastCheckedDate;
     var isJLPT = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.setting.appSystem; }) === "JLPT";
     var isCompletelyFree = (0, react_redux_1.useSelector)(function (state) { var _a; return (_a = state.app.appSetting.setting) === null || _a === void 0 ? void 0 : _a.payment.isCompletelyFree; }) || false;
+    var items = allFreeId ? [allFreeId] : [];
     (0, react_1.useEffect)(function () {
-        var isCheckRequir = (0, CoinCheck_1.isCheckRequired)(allFreeState, lastCheckedDate, isCompletelyFree);
-        if (isCheckRequir) {
-            // 最終チェック日を更新・成功しようがしまいが、1日1回以上やらないようにする.
-            var todayStr = lib_1.timeFnc.getTodayString();
-            dispatch({ type: "setting/updateLastCheckedDate", payload: todayStr });
-            // ここで復元処理を行う
-            dispatch((0, CoinCheck_1.coinCheckFnc)(allFreeId));
-        }
+        var cancelled = false;
+        (function () { return __awaiter(void 0, void 0, void 0, function () {
+            var need, todayStr, e_1, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        need = (0, CoinCheck_1.isCheckRequired)(allFreeState, lastCheckedDate, isCompletelyFree);
+                        console.log("Check required:", need);
+                        if (!need)
+                            return [2 /*return*/];
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 5, 6, 10]);
+                        todayStr = lib_1.timeFnc.getTodayString();
+                        dispatch({ type: "setting/updateLastCheckedDate", payload: todayStr });
+                        // 3) 接続
+                        // --- expo-iap ---
+                        return [4 /*yield*/, (0, CoinFnc_1.initializeIAP)(items)];
+                    case 2:
+                        // 3) 接続
+                        // --- expo-iap ---
+                        _b.sent();
+                        return [4 /*yield*/, new Promise(function (r) { return setTimeout(r, 5000); })];
+                    case 3:
+                        _b.sent(); // 少し待つ
+                        // 4) チェック本体（復元や検証）
+                        return [4 /*yield*/, dispatch((0, CoinCheck_1.coinCheckFnc)(allFreeId))];
+                    case 4:
+                        // 4) チェック本体（復元や検証）
+                        _b.sent();
+                        return [3 /*break*/, 10];
+                    case 5:
+                        e_1 = _b.sent();
+                        console.warn("IAP check failed:", e_1);
+                        return [3 /*break*/, 10];
+                    case 6:
+                        _b.trys.push([6, 8, , 9]);
+                        return [4 /*yield*/, (0, expo_iap_1.endConnection)()];
+                    case 7:
+                        _b.sent();
+                        return [3 /*break*/, 9];
+                    case 8:
+                        _a = _b.sent();
+                        return [3 /*break*/, 9];
+                    case 9: return [7 /*endfinally*/];
+                    case 10: return [2 /*return*/];
+                }
+            });
+        }); })();
+        return function () {
+            cancelled = true;
+        };
+        // 依存は必要最小限。チェック条件が変わった時だけ再評価されるように。
     }, []);
     var scoreInfo = (0, quizHook_1.useScoreInfo)();
     return (<react_native_1.View style={styles.page}>
@@ -68,6 +152,13 @@ var ResultPage = function (_a) {
         <common_1.MiniIconBtn onPress={function () { return navigation.goBack(); }} icon="arrow-left" title={t("quiz.resultBtn.back")} color="blue" outerStyle={styles.miniBtnOuter}/>
       </react_native_1.View>
       <QuizFlatList_1.default navigation={navigation}/>
+      {/* <Button
+          title={"チェック"}
+          onPress={async () => {
+            const purchases = await getAvailablePurchases();
+            console.log("getAvailablePurchases", purchases);
+          }}
+        /> */}
     </react_native_1.View>);
 };
 var styles = react_native_1.StyleSheet.create({