Skip to content

Run firebase functions on main domain #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mreichhoff merged 2 commits into from
May 13, 2026
Merged

Run firebase functions on main domain #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c8e86a
Ensure firebase functions run under main domain
mreichhoff May 9, 2026
4aad57a
use origin instead of hardcoded URL
mreichhoff May 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 43 additions & 1 deletion firebase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,48 @@
"**/node_modules/**"
],
"rewrites": [
{
"source": "/explainText",
"function": {
"functionId": "explainText",
"region": "us-central1"
}
},
{
"source": "/explainEnglishText",
"function": {
"functionId": "explainEnglishText",
"region": "us-central1"
}
},
{
"source": "/analyzeImage",
"function": {
"functionId": "analyzeImage",
"region": "us-central1"
}
},
{
"source": "/generateChineseSentences",
"function": {
"functionId": "generateChineseSentences",
"region": "us-central1"
}
},
{
"source": "/analyzeCollocation",
"function": {
"functionId": "analyzeCollocation",
"region": "us-central1"
}
},
{
"source": "/explainWordInContext",
"function": {
"functionId": "explainWordInContext",
"region": "us-central1"
}
},
{
"source": "/components/**",
"destination": "/components/index.html"
Expand Down Expand Up @@ -51,4 +93,4 @@
]
}
]
}
}
12 changes: 6 additions & 6 deletions public/js/modules/data-layer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ async function explainChineseSentence(text) {
if (localAi.isLocalAiEnabled()) {
return await localAi.explainChineseSentence(text);
}
const functions = getFunctions();
const functions = getFunctions(getApp(), window.location.origin);
// connectFunctionsEmulator(functions, "127.0.0.1", 5001);
const explainChinese = httpsCallable(functions, 'explainText');
const result = await explainChinese(text);
Expand All @@ -737,7 +737,7 @@ async function translateEnglish(text) {
if (localAi.isLocalAiEnabled()) {
result = await localAi.translateEnglish(text);
} else {
const functions = getFunctions();
const functions = getFunctions(getApp(), window.location.origin);
// connectFunctionsEmulator(functions, "127.0.0.1", 5001);
const explainEnglish = httpsCallable(functions, 'explainEnglishText');
result = await explainEnglish(text);
Expand All @@ -752,7 +752,7 @@ async function generateChineseSentences(word, definitions) {
if (localAi.isLocalAiEnabled()) {
aiData = await localAi.generateChineseSentences(word, definitions);
} else {
const functions = getFunctions();
const functions = getFunctions(getApp(), window.location.origin);
// connectFunctionsEmulator(functions, "127.0.0.1", 5001);
const generateChineseSentencesCall = httpsCallable(functions, 'generateChineseSentences');
aiData = await generateChineseSentencesCall({ word, definitions });
Expand All @@ -774,7 +774,7 @@ async function analyzeCollocation(collocation) {
if (localAi.isLocalAiEnabled()) {
aiData = await localAi.analyzeCollocation(collocation);
} else {
const functions = getFunctions();
const functions = getFunctions(getApp(), window.location.origin);
// connectFunctionsEmulator(functions, "127.0.0.1", 5001);
const analyzeCollocationCall = httpsCallable(functions, 'analyzeCollocation');
aiData = await analyzeCollocationCall(collocation);
Expand All @@ -797,7 +797,7 @@ async function analyzeImage(base64ImageContents) {
if (localAi.isLocalAiEnabled()) {
return await localAi.analyzeImage(base64ImageContents);
}
const functions = getFunctions();
const functions = getFunctions(getApp(), window.location.origin);
// connectFunctionsEmulator(functions, "127.0.0.1", 5001);
const analyzeImage = httpsCallable(functions, 'analyzeImage');
const result = await analyzeImage(base64ImageContents);
Expand All @@ -808,7 +808,7 @@ async function explainWordInContext(word, sentence) {
if (localAi.isLocalAiEnabled()) {
return await localAi.explainWordInContext(word, sentence);
}
const functions = getFunctions();
const functions = getFunctions(getApp(), window.location.origin);
// connectFunctionsEmulator(functions, "127.0.0.1", 5001);
const explainWordInContextCall = httpsCallable(functions, 'explainWordInContext');
const result = await explainWordInContextCall({ word, sentence });
Expand Down
Loading