@mathrunet/masamune 1.10.3 → 2.0.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+# [2.0.0](https://github.com/mathrunet/node_masamune/compare/v1.10.4...v2.0.0) (2024-01-15)
+
+
+### feat
+
+* Compatible with FirebaseFunctionsV2. ([df2cc6d](https://github.com/mathrunet/node_masamune/commit/df2cc6d050fe249781fe42afb5633e6d39b32f74))
+
+
+
+## [1.10.4](https://github.com/mathrunet/node_masamune/compare/v1.10.3...v1.10.4) (2024-01-03)
+
+
+### fix
+
+* Changed license. ([b77a5f2](https://github.com/mathrunet/node_masamune/commit/b77a5f24019b1ff94188aaa1f6053d968152148e))
+
+
+
 ## [1.10.3](https://github.com/mathrunet/node_masamune/compare/v1.10.2...v1.10.3) (2023-12-22)
 
 

package/LICENSE

@@ -1,24 +1,21 @@
-Copyright (c) 2023, mathru (https://mathru.net)
-All rights reserved.
+MIT License
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright notice, 
-  this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, 
-  this list of conditions and the following disclaimer in the documentation 
-  and/or other materials provided with the distribution.
-* Neither the name of the <organization> nor the names of its contributors 
-  may be used to endorse or promote products derived from this software 
-  without specific prior written permission.
+Copyright (c) 2024 mathru (https://mathru.net)
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/functions/agora_cloud_recording.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const functions = __importStar(require("firebase-functions"));
+const functions = __importStar(require("firebase-functions/v2"));
 const admin = __importStar(require("firebase-admin"));
 /**
  * Convert files generated by Agora.io's cloud recording into an easy-to-handle format from within the app.
@@ -43,62 +43,72 @@ const admin = __importStar(require("firebase-admin"));
  *
  * FirebaseStorageにファイルが保存されたタイミングで実行されます。
  */
-module.exports = (regions, timeoutSeconds, data) => functions.runWith({ timeoutSeconds: timeoutSeconds }).storage.object().onFinalize((object) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const source = object.name;
-        if (!source) {
-            return;
-        }
-        const bucket = admin.storage().bucket(object.bucket);
-        const targetScreenShot = source.toString().match(/([a-z0-9A-Z]+)_([a-z0-9A-Z]+)__uid_s_([0-9]+)__uid_e_video_([0-9]+).jp(e)?g/);
-        if (targetScreenShot) {
-            const target = targetScreenShot[2] + ".jpg";
-            if (target == source.toString()) {
-                console.log("Jpeg file is not replaced.");
+module.exports = (regions, options, data) => {
+    var _a;
+    return functions.storage.onObjectFinalized({
+        region: regions[0],
+        timeoutSeconds: options.timeoutSeconds,
+        memory: options.memory,
+        minInstances: options.minInstances,
+        concurrency: options.concurrency,
+        maxInstances: (_a = options.maxInstances) !== null && _a !== void 0 ? _a : undefined,
+    }, (object) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const source = object.data.name;
+            if (!source) {
                 return;
             }
-            yield bucket.file(source).copy(target, {
-                contentType: "image/jpeg",
-            });
-            yield bucket.file(source).delete();
-            yield bucket.file(target).makePublic();
-        }
-        else {
-            const targetM3U8 = source.toString().match(/([a-z0-9A-Z]+)_([a-z0-9A-Z]+).m3u8/);
-            if (targetM3U8) {
-                const target = targetM3U8[2] + ".m3u8";
+            const bucket = admin.storage().bucket(object.bucket);
+            const targetScreenShot = source.toString().match(/([a-z0-9A-Z]+)_([a-z0-9A-Z]+)__uid_s_([0-9]+)__uid_e_video_([0-9]+).jp(e)?g/);
+            if (targetScreenShot) {
+                const target = targetScreenShot[2] + ".jpg";
                 if (target == source.toString()) {
-                    console.log("M3U8 file is not replaced.");
+                    console.log("Jpeg file is not replaced.");
                     return;
                 }
                 yield bucket.file(source).copy(target, {
-                    cacheControl: "no-cache",
-                    contentType: "application/x-mpegURL",
+                    contentType: "image/jpeg",
                 });
                 yield bucket.file(source).delete();
                 yield bucket.file(target).makePublic();
             }
             else {
-                const targetTS = source.toString().match(/([a-z0-9A-Z]+)_([a-z0-9A-Z]+)_([a-z0-9A-Z]+).ts/);
-                if (targetTS) {
-                    const target = targetTS[0];
+                const targetM3U8 = source.toString().match(/([a-z0-9A-Z]+)_([a-z0-9A-Z]+).m3u8/);
+                if (targetM3U8) {
+                    const target = targetM3U8[2] + ".m3u8";
                     if (target == source.toString()) {
-                        console.log("Ts file is not replaced.");
+                        console.log("M3U8 file is not replaced.");
                         return;
                     }
-                    console.log("Ts file is replaced.");
                     yield bucket.file(source).copy(target, {
-                        contentType: "video/MP2T",
+                        cacheControl: "no-cache",
+                        contentType: "application/x-mpegURL",
                     });
                     yield bucket.file(source).delete();
                     yield bucket.file(target).makePublic();
                 }
+                else {
+                    const targetTS = source.toString().match(/([a-z0-9A-Z]+)_([a-z0-9A-Z]+)_([a-z0-9A-Z]+).ts/);
+                    if (targetTS) {
+                        const target = targetTS[0];
+                        if (target == source.toString()) {
+                            console.log("Ts file is not replaced.");
+                            return;
+                        }
+                        console.log("Ts file is replaced.");
+                        yield bucket.file(source).copy(target, {
+                            contentType: "video/MP2T",
+                        });
+                        yield bucket.file(source).delete();
+                        yield bucket.file(target).makePublic();
+                    }
+                }
             }
         }
-    }
-    catch (err) {
-        console.error(err);
-        throw err;
-    }
-}));
+        catch (err) {
+            console.error(err);
+            throw err;
+        }
+    }));
+};
 //# sourceMappingURL=agora_cloud_recording.js.map

package/dist/functions/agora_cloud_recording.js.map

@@ -1 +1 @@
-{"version":3,"file":"agora_cloud_recording.js","sourceRoot":"","sources":["../../src/functions/agora_cloud_recording.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agora_cloud_recording.js","sourceRoot":"","sources":["../../src/functions/agora_cloud_recording.ts"],"names":[],"mappings":"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"}

package/dist/functions/agora_token.js

@@ -32,14 +32,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const functions = __importStar(require("firebase-functions"));
+const functions = __importStar(require("firebase-functions/v2"));
 const agora_token_1 = require("agora-token");
 /**
  * Obtain an Agora.io security token.
  *
  * Agora.ioのセキュリティトークンを取得します。
  *
- * @param agora.app_id
+ * @param process.env.AGORA_APPID
  * AppID for Agora.
  * Log in to the following URL and create a project.
  * After the project is created, the AppID can be copied.
@@ -50,7 +50,7 @@ const agora_token_1 = require("agora-token");
  *
  * https://console.agora.io/projects
  *
- * @param agora.app_certificate
+ * @param process.env.AGORA_APPCERTIFICATE
  * AppCertificate for Agora.
  * You can obtain the certificate after entering the project you created and activating it in Security -> App certificate.
  *
@@ -74,33 +74,43 @@ const agora_token_1 = require("agora-token");
  *
  * 役割。"audience"か"broadcaster"が指定できます。
  */
-module.exports = (regions, timeoutSeconds, data) => functions.runWith({ timeoutSeconds: timeoutSeconds }).region(...regions).https.onCall((query) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const config = functions.config().agora;
-        const appId = config.app_id;
-        const appCertificate = config.app_certificate;
-        const expirationTimeInSeconds = 3600;
-        let role = agora_token_1.RtcRole.PUBLISHER;
-        if (query.role === "audience") {
-            role = agora_token_1.RtcRole.SUBSCRIBER;
+module.exports = (regions, options, data) => {
+    var _a;
+    return functions.https.onCall({
+        region: regions,
+        timeoutSeconds: options.timeoutSeconds,
+        memory: options.memory,
+        minInstances: options.minInstances,
+        concurrency: options.concurrency,
+        maxInstances: (_a = options.maxInstances) !== null && _a !== void 0 ? _a : undefined,
+    }, (query) => __awaiter(void 0, void 0, void 0, function* () {
+        var _b, _c;
+        try {
+            const appId = (_b = process.env.AGORA_APPID) !== null && _b !== void 0 ? _b : "";
+            const appCertificate = (_c = process.env.AGORA_APPCERTIFICATE) !== null && _c !== void 0 ? _c : "";
+            const expirationTimeInSeconds = 3600;
+            let role = agora_token_1.RtcRole.PUBLISHER;
+            if (query.data.role === "audience") {
+                role = agora_token_1.RtcRole.SUBSCRIBER;
+            }
+            const channelName = query.data.name;
+            let uid = 0;
+            if (query.data.uid) {
+                uid = query.data.uid;
+            }
+            if (!channelName) {
+                throw new functions.https.HttpsError("invalid-argument", "Channel is invalid.");
+            }
+            const token = agora_token_1.RtcTokenBuilder.buildTokenWithUid(appId, appCertificate, channelName, uid, role, expirationTimeInSeconds, expirationTimeInSeconds);
+            return {
+                channel: channelName,
+                token: token,
+            };
         }
-        const channelName = query.name;
-        let uid = 0;
-        if (query.uid) {
-            uid = query.uid;
+        catch (err) {
+            console.error(err);
+            throw err;
         }
-        if (!channelName) {
-            throw new functions.https.HttpsError("invalid-argument", "Channel is invalid.");
-        }
-        const token = agora_token_1.RtcTokenBuilder.buildTokenWithUid(appId, appCertificate, channelName, uid, role, expirationTimeInSeconds, expirationTimeInSeconds);
-        return {
-            channel: channelName,
-            token: token,
-        };
-    }
-    catch (err) {
-        console.error(err);
-        throw err;
-    }
-}));
+    }));
+};
 //# sourceMappingURL=agora_token.js.map

package/dist/functions/agora_token.js.map

@@ -1 +1 @@
-{"version":3,"file":"agora_token.js","sourceRoot":"","sources":["../../src/functions/agora_token.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,6CAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,cAAsB,EAAE,IAA+B,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAChL,CAAO,KAAK,EAAE,EAAE;IACZ,IAAI;QACA,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,MAAM,cAAc,GAAG,MAAM,CAAC,eAAe,CAAC;QAC9C,MAAM,uBAAuB,GAAG,IAAI,CAAC;QACrC,IAAI,IAAI,GAAG,qBAAO,CAAC,SAAS,CAAC;QAC7B,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;YAC3B,IAAI,GAAG,qBAAO,CAAC,UAAU,CAAC;SAC7B;QACD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC;QAC/B,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,IAAI,KAAK,CAAC,GAAG,EAAE;YACX,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;SACnB;QACD,IAAI,CAAC,WAAW,EAAE;YACd,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;SACnF;QACD,MAAM,KAAK,GAAG,6BAAe,CAAC,iBAAiB,CAC3C,KAAK,EACL,cAAc,EACd,WAAW,EACX,GAAG,EACH,IAAI,EACJ,uBAAuB,EACvB,uBAAuB,CAC1B,CAAC;QACF,OAAO;YACH,OAAO,EAAE,WAAW;YACpB,KAAK,EAAE,KAAK;SACf,CAAC;KACL;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,MAAM,GAAG,CAAC;KACb;AACL,CAAC,CAAA,CACJ,CAAC"}
+{"version":3,"file":"agora_token.js","sourceRoot":"","sources":["../../src/functions/agora_token.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,6CAAuD;AAGvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAM,CAAC,OAAO,GAAG,CACb,OAAiB,EACjB,OAAyB,EACzB,IAA+B,EACjC,EAAE;;IAAC,OAAA,SAAS,CAAC,KAAK,CAAC,MAAM,CACvB;QACI,MAAM,EAAE,OAAO;QACf,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,SAAS;KAClD,EACD,CAAO,KAAK,EAAE,EAAE;;QACZ,IAAI;YACA,MAAM,KAAK,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,WAAW,mCAAI,EAAE,CAAC;YAC5C,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,oBAAoB,mCAAI,EAAE,CAAC;YAC9D,MAAM,uBAAuB,GAAG,IAAI,CAAC;YACrC,IAAI,IAAI,GAAG,qBAAO,CAAC,SAAS,CAAC;YAC7B,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE;gBAChC,IAAI,GAAG,qBAAO,CAAC,UAAU,CAAC;aAC7B;YACD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YACpC,IAAI,GAAG,GAAG,CAAC,CAAC;YACZ,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChB,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;aACxB;YACD,IAAI,CAAC,WAAW,EAAE;gBACd,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;aACnF;YACD,MAAM,KAAK,GAAG,6BAAe,CAAC,iBAAiB,CAC3C,KAAK,EACL,cAAc,EACd,WAAW,EACX,GAAG,EACH,IAAI,EACJ,uBAAuB,EACvB,uBAAuB,CAC1B,CAAC;YACF,OAAO;gBACH,OAAO,EAAE,WAAW;gBACpB,KAAK,EAAE,KAAK;aACf,CAAC;SACL;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,MAAM,GAAG,CAAC;SACb;IACL,CAAC,CAAA,CACJ,CAAA;CAAA,CAAC"}

package/dist/functions/android_auth_code.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const functions = __importStar(require("firebase-functions"));
+const functions = __importStar(require("firebase-functions/v2"));
 /**
  * After being redirected from [android_auth_code], you will get a refresh token to connect to Google's API.
  * Please execute [android_auth_code] after registering the required information.
@@ -40,14 +40,14 @@ const functions = __importStar(require("firebase-functions"));
  * [android_auth_code]からリダイレクトされた後、GoogleのAPIに接続するためのリフレッシュトークンを取得します。
  * 必要情報を登録した後[android_auth_code]を実行してください。
  *
- * @param purchase.android.redirect_uri
+ * @param process.env.PURCHASE_ANDROID_REDIRECTURI
  * Describe the absolute URL where [android_token] exists.
  * You will be redirected to this URL to obtain a refresh token.
  *
  * [android_token]が存在する絶対URLを記述します。
  * このURLにリダイレクトされリフレッシュトークンを取得できます。
  *
- * @param purchase.android.client_id
+ * @param process.env.PURCHASE_ANDROID_CLIENTID
  * Google's OAuth 2.0 client ID.
  * Create an OAuth consent screen from the URL below.
  * https://console.cloud.google.com/apis/credentials/consent
@@ -60,17 +60,27 @@ const functions = __importStar(require("firebase-functions"));
  * その後、認証情報からOAuth 2.0 クライアントIDを作成します。
  * https://console.cloud.google.com/apis/credentials
  */
-module.exports = (regions, timeoutSeconds, data) => functions.runWith({ timeoutSeconds: timeoutSeconds }).region(...regions).https.onRequest((req, res) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const config = functions.config().purchase;
-        if (!req.query.id || !config.android.redirect_uri) {
-            throw new functions.https.HttpsError("invalid-argument", "Query parameter is invalid.");
+module.exports = (regions, options, data) => {
+    var _a;
+    return functions.https.onRequest({
+        region: regions,
+        timeoutSeconds: options.timeoutSeconds,
+        memory: options.memory,
+        minInstances: options.minInstances,
+        concurrency: options.concurrency,
+        maxInstances: (_a = options.maxInstances) !== null && _a !== void 0 ? _a : undefined,
+    }, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const redirectUri = process.env.PURCHASE_ANDROID_REDIRECTURI;
+            if (!req.query.id || !redirectUri) {
+                throw new functions.https.HttpsError("invalid-argument", "Query parameter is invalid.");
+            }
+            res.redirect(`https://accounts.google.com/o/oauth2/auth?response_type=code&client_id=${req.query.id}&redirect_uri=${redirectUri}&scope=https://www.googleapis.com/auth/androidpublisher&access_type=offline&approval_prompt=force`);
         }
-        res.redirect(`https://accounts.google.com/o/oauth2/auth?response_type=code&client_id=${req.query.id}&redirect_uri=${config.android.redirect_uri}&scope=https://www.googleapis.com/auth/androidpublisher&access_type=offline&approval_prompt=force`);
-    }
-    catch (err) {
-        console.error(err);
-        res.end();
-    }
-}));
+        catch (err) {
+            console.error(err);
+            res.end();
+        }
+    }));
+};
 //# sourceMappingURL=android_auth_code.js.map

package/dist/functions/android_auth_code.js.map

@@ -1 +1 @@
-{"version":3,"file":"android_auth_code.js","sourceRoot":"","sources":["../../src/functions/android_auth_code.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,cAAsB,EAAE,IAA+B,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,SAAS,CACnL,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IACf,IAAI;QACA,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC;QAC3C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE;YAC/C,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,6BAA6B,CAAC,CAAC;SAC3F;QACD,GAAG,CAAC,QAAQ,CACR,0EAA0E,GAAG,CAAC,KAAK,CAAC,EAAE,iBAAiB,MAAM,CAAC,OAAO,CAAC,YAAY,mGAAmG,CACxO,CAAC;KACL;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,GAAG,CAAC,GAAG,EAAE,CAAC;KACb;AACL,CAAC,CAAA,CACJ,CAAC"}
+{"version":3,"file":"android_auth_code.js","sourceRoot":"","sources":["../../src/functions/android_auth_code.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AAGnD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,OAAO,GAAG,CACb,OAAiB,EACjB,OAAyB,EACzB,IAA+B,EACjC,EAAE;;IAAC,OAAA,SAAS,CAAC,KAAK,CAAC,SAAS,CAC1B;QACI,MAAM,EAAE,OAAO;QACf,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,SAAS;KAClD,EACD,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACf,IAAI;YACA,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC;YAC7D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE;gBAC/B,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,6BAA6B,CAAC,CAAC;aAC3F;YACD,GAAG,CAAC,QAAQ,CACR,0EAA0E,GAAG,CAAC,KAAK,CAAC,EAAE,iBAAiB,WAAW,mGAAmG,CACxN,CAAC;SACL;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,GAAG,CAAC,GAAG,EAAE,CAAC;SACb;IACL,CAAC,CAAA,CACJ,CAAA;CAAA,CAAC"}

package/dist/functions/android_token.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const functions = __importStar(require("firebase-functions"));
+const functions = __importStar(require("firebase-functions/v2"));
 const api_1 = require("../lib/api");
 /**
  * After being redirected from [android_auth_code], you will get a refresh token to connect to Google's API.
@@ -41,14 +41,14 @@ const api_1 = require("../lib/api");
  * [android_auth_code]からリダイレクトされた後、GoogleのAPIに接続するためのリフレッシュトークンを取得します。
  * 必要情報を登録した後[android_auth_code]を実行してください。
  *
- * @param purchase.android.redirect_uri
+ * @param process.env.PURCHASE_ANDROID_REDIRECTURI
  * Describe the absolute URL where [android_token] exists.
  * You will be redirected to this URL to obtain a refresh token.
  *
  * [android_token]が存在する絶対URLを記述します。
  * このURLにリダイレクトされリフレッシュトークンを取得できます。
  *
- * @param purchase.android.client_id
+ * @param process.env.PURCHASE_ANDROID_CLIENTID
  * Google's OAuth 2.0 client ID.
  * Create an OAuth consent screen from the URL below.
  * https://console.cloud.google.com/apis/credentials/consent
@@ -61,7 +61,7 @@ const api_1 = require("../lib/api");
  * その後、認証情報からOAuth 2.0 クライアントIDを作成します。
  * https://console.cloud.google.com/apis/credentials
  *
- * @param purchase.android.client_secret
+ * @param process.env.PURCHASE_ANDROID_CLIENTSECRET
  * Google's OAuth 2.0 client secret.
  * Create an OAuth consent screen from the URL below.
  * https://console.cloud.google.com/apis/credentials/consent
@@ -74,36 +74,48 @@ const api_1 = require("../lib/api");
  * その後、認証情報からOAuth 2.0 クライアントIDを作成します。
  * https://console.cloud.google.com/apis/credentials
  */
-module.exports = (regions, timeoutSeconds, data) => functions.runWith({ timeoutSeconds: timeoutSeconds }).region(...regions).https.onRequest((req, res) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const config = functions.config().purchase;
-        if (!req.query.code || !config.android.client_id || !config.android.client_secret || !config.android.redirect_uri) {
-            throw new functions.https.HttpsError("invalid-argument", "Query parameter is invalid.");
+module.exports = (regions, options, data) => {
+    var _a;
+    return functions.https.onRequest({
+        region: regions,
+        timeoutSeconds: options.timeoutSeconds,
+        memory: options.memory,
+        minInstances: options.minInstances,
+        concurrency: options.concurrency,
+        maxInstances: (_a = options.maxInstances) !== null && _a !== void 0 ? _a : undefined,
+    }, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const redirectUri = process.env.PURCHASE_ANDROID_REDIRECTURI;
+            const clientId = process.env.PURCHASE_ANDROID_CLIENTID;
+            const clientSecret = process.env.PURCHASE_ANDROID_CLIENTSECRET;
+            if (!req.query.code || !clientId || !clientSecret || !redirectUri) {
+                throw new functions.https.HttpsError("invalid-argument", "Query parameter is invalid.");
+            }
+            const resp = yield api_1.Api.post("https://accounts.google.com/o/oauth2/token", {
+                timeout: 30 * 1000,
+                data: {
+                    "grant_type": "authorization_code",
+                    "client_id": clientId,
+                    "client_secret": clientSecret,
+                    "redirect_uri": redirectUri,
+                    "access_type": "offline",
+                    "code": req.query.code,
+                },
+            });
+            if (!resp) {
+                throw new functions.https.HttpsError("data-loss", "Cannot get access token.");
+            }
+            const json = (yield resp.json());
+            if (json === null) {
+                throw new functions.https.HttpsError("data-loss", "Cannot get access token.");
+            }
+            console.log(json);
+            res.send(`RefreshToken:${json["refresh_token"]}`);
         }
-        const resp = yield api_1.Api.post("https://accounts.google.com/o/oauth2/token", {
-            timeout: 30 * 1000,
-            data: {
-                "grant_type": "authorization_code",
-                "client_id": config.android.client_id,
-                "client_secret": config.android.client_secret,
-                "redirect_uri": config.android.redirect_uri,
-                "access_type": "offline",
-                "code": req.query.code,
-            },
-        });
-        if (!resp) {
-            throw new functions.https.HttpsError("data-loss", "Cannot get access token.");
+        catch (err) {
+            console.error(err);
+            res.end();
         }
-        const json = (yield resp.json());
-        if (json === null) {
-            throw new functions.https.HttpsError("data-loss", "Cannot get access token.");
-        }
-        console.log(json);
-        res.send(`RefreshToken:${json["refresh_token"]}`);
-    }
-    catch (err) {
-        console.error(err);
-        res.end();
-    }
-}));
+    }));
+};
 //# sourceMappingURL=android_token.js.map

package/dist/functions/android_token.js.map

@@ -1 +1 @@
-{"version":3,"file":"android_token.js","sourceRoot":"","sources":["../../src/functions/android_token.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,oCAAiC;AAGjC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,cAAsB,EAAE,IAA+B,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,SAAS,CACnL,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IACf,IAAI;QACA,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC;QAC3C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE;YAC/G,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,6BAA6B,CAAC,CAAC;SAC3F;QACD,MAAM,IAAI,GAAG,MAAM,SAAG,CAAC,IAAI,CAAC,4CAA4C,EAAE;YACtE,OAAO,EAAE,EAAE,GAAG,IAAI;YAClB,IAAI,EAAE;gBACF,YAAY,EAAE,oBAAoB;gBAClC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS;gBACrC,eAAe,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa;gBAC7C,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY;gBAC3C,aAAa,EAAE,SAAS;gBACxB,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI;aACzB;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC;SACjF;QACD,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAA2B,CAAC;QAC3D,IAAI,IAAI,KAAK,IAAI,EAAE;YACf,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC;SACjF;QACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,GAAG,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;KACrD;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,GAAG,CAAC,GAAG,EAAE,CAAC;KACb;AACL,CAAC,CAAA,CACJ,CAAC"}
+{"version":3,"file":"android_token.js","sourceRoot":"","sources":["../../src/functions/android_token.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,oCAAiC;AAIjC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAM,CAAC,OAAO,GAAG,CACb,OAAiB,EACjB,OAAyB,EACzB,IAA+B,EACjC,EAAE;;IAAC,OAAA,SAAS,CAAC,KAAK,CAAC,SAAS,CAC1B;QACI,MAAM,EAAE,OAAO;QACf,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,SAAS;KAClD,EACD,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACf,IAAI;YACA,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC;YAC7D,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;YACvD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC;YAC/D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,IAAI,CAAC,WAAW,EAAE;gBAC/D,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,6BAA6B,CAAC,CAAC;aAC3F;YACD,MAAM,IAAI,GAAG,MAAM,SAAG,CAAC,IAAI,CAAC,4CAA4C,EAAE;gBACtE,OAAO,EAAE,EAAE,GAAG,IAAI;gBAClB,IAAI,EAAE;oBACF,YAAY,EAAE,oBAAoB;oBAClC,WAAW,EAAE,QAAQ;oBACrB,eAAe,EAAE,YAAY;oBAC7B,cAAc,EAAE,WAAW;oBAC3B,aAAa,EAAE,SAAS;oBACxB,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI;iBACzB;aACJ,CAAC,CAAC;YACH,IAAI,CAAC,IAAI,EAAE;gBACP,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC;aACjF;YACD,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAA2B,CAAC;YAC3D,IAAI,IAAI,KAAK,IAAI,EAAE;gBACf,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC;aACjF;YACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;SACrD;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,GAAG,CAAC,GAAG,EAAE,CAAC;SACb;IACL,CAAC,CAAA,CACJ,CAAA;CAAA,CAAC"}

package/dist/functions/consumable_verify_android.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const functions = __importStar(require("firebase-functions"));
+const functions = __importStar(require("firebase-functions/v2"));
 const verifier = __importStar(require("../lib/verify_android"));
 const updater = __importStar(require("../lib/update_wallet"));
 /**
@@ -40,12 +40,12 @@ const updater = __importStar(require("../lib/update_wallet"));
  *
  * 消費型のアプリ内課金を行います。[path]に指定したドキュメント内のフィールドの値を[value]に加算します。
  *
- * @param purchase.android.refresh_token
+ * @param process.env.PURCHASE_ANDROID_REFRESHTOKEN
  * Describe the refresh token that can be obtained by accessing [android_auth_code].
  *
  * [android_auth_code]にアクセスすることで取得できるリフレッシュトークンを記述します。
  *
- * @param purchase.android.client_id
+ * @param process.env.PURCHASE_ANDROID_CLIENTID
  * Google's OAuth 2.0 client ID.
  * Create an OAuth consent screen from the URL below.
  * https://console.cloud.google.com/apis/credentials/consent
@@ -58,7 +58,7 @@ const updater = __importStar(require("../lib/update_wallet"));
  * その後、認証情報からOAuth 2.0 クライアントIDを作成します。
  * https://console.cloud.google.com/apis/credentials
  *
- * @param purchase.android.client_secret
+ * @param process.env.PURCHASE_ANDROID_CLIENTSECRET
  * Google's OAuth 2.0 client secret.
  * Create an OAuth consent screen from the URL below.
  * https://console.cloud.google.com/apis/credentials/consent
@@ -96,37 +96,47 @@ const updater = __importStar(require("../lib/update_wallet"));
  *
  * 購入したときに発行された購入トークン。
  */
-module.exports = (regions, timeoutSeconds, data) => functions.runWith({ timeoutSeconds: timeoutSeconds }).region(...regions).https.onCall((query) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const config = functions.config().purchase;
-        /* ==== Android検証ここから ==== */
-        const res = yield verifier.verifyAndroid({
-            type: "products",
-            clientId: config.android.client_id,
-            clientSecret: config.android.client_secret,
-            refreshToken: config.android.refresh_token,
-            packageName: query.packageName,
-            productId: query.productId,
-            purchaseToken: query.purchaseToken,
-        });
-        if (res["purchaseState"] !== 0) {
-            throw new functions.https.HttpsError("unauthenticated", "Illegal receipt.");
-        }
-        /* ==== ここまでAndroid検証 ==== */
-        if (!query.path || !query.value) {
+module.exports = (regions, options, data) => {
+    var _a;
+    return functions.https.onCall({
+        region: regions,
+        timeoutSeconds: options.timeoutSeconds,
+        memory: options.memory,
+        minInstances: options.minInstances,
+        concurrency: options.concurrency,
+        maxInstances: (_a = options.maxInstances) !== null && _a !== void 0 ? _a : undefined,
+    }, (query) => __awaiter(void 0, void 0, void 0, function* () {
+        var _b, _c, _d;
+        try {
+            /* ==== Android検証ここから ==== */
+            const res = yield verifier.verifyAndroid({
+                type: "products",
+                clientId: (_b = process.env.PURCHASE_ANDROID_CLIENTID) !== null && _b !== void 0 ? _b : "",
+                clientSecret: (_c = process.env.PURCHASE_ANDROID_CLIENTSECRET) !== null && _c !== void 0 ? _c : "",
+                refreshToken: (_d = process.env.PURCHASE_ANDROID_REFRESHTOKEN) !== null && _d !== void 0 ? _d : "",
+                packageName: query.data.packageName,
+                productId: query.data.productId,
+                purchaseToken: query.data.purchaseToken,
+            });
+            if (res["purchaseState"] !== 0) {
+                throw new functions.https.HttpsError("unauthenticated", "Illegal receipt.");
+            }
+            /* ==== ここまでAndroid検証 ==== */
+            if (!query.data.path || !query.data.value) {
+                return res;
+            }
+            /* ==== Firestoreの更新ここから ==== */
+            yield updater.updateWallet({
+                targetDocumentFieldPath: query.data.path,
+                value: query.data.value,
+            });
+            /* ==== ここまでFirestoreの更新 ==== */
             return res;
         }
-        /* ==== Firestoreの更新ここから ==== */
-        yield updater.updateWallet({
-            targetDocumentFieldPath: query.path,
-            value: query.value,
-        });
-        /* ==== ここまでFirestoreの更新 ==== */
-        return res;
-    }
-    catch (err) {
-        console.error(err);
-        throw err;
-    }
-}));
+        catch (err) {
+            console.error(err);
+            throw err;
+        }
+    }));
+};
 //# sourceMappingURL=consumable_verify_android.js.map