@tacoreai/web-sdk 1.23.0 → 1.24.0

package/database/core/apps/AppsClient.AppServer.js

@@ -21,6 +21,29 @@ const isBrowserPreviewRuntime = () => {
   return pathname.startsWith("/app-run/");
 };
 
+const normalizeAppId = value => String(value || "").trim();
+
+const getAppServerOwnerAppId = function() {
+  const explicitOwnerAppId = normalizeAppId(this.config?.appServerOwnerAppId);
+  if (explicitOwnerAppId) {
+    return explicitOwnerAppId;
+  }
+
+  const shellAppId = normalizeAppId(this.config?.appId);
+  if (shellAppId) {
+    return shellAppId;
+  }
+
+  if (typeof this._getChannelAppId === "function") {
+    const channelAppId = normalizeAppId(this._getChannelAppId());
+    if (channelAppId) {
+      return channelAppId;
+    }
+  }
+
+  return normalizeAppId(this.appId);
+};
+
 const hasOwn = (value, key) => Object.prototype.hasOwnProperty.call(value, key);
 
 const isPlainObject = (value) => Object.prototype.toString.call(value) === "[object Object]";
@@ -100,22 +123,23 @@ const clearPreviewSessionToken = (appId) => {
 
 const getPreviewSessionToken = async function(options = {}) {
   const { forceRefresh = false } = options;
+  const appServerOwnerAppId = getAppServerOwnerAppId.call(this);
   if (forceRefresh) {
-    clearPreviewSessionToken(this.appId);
+    clearPreviewSessionToken(appServerOwnerAppId);
   }
 
-  const cachedToken = previewSessionTokenCache.get(this.appId);
+  const cachedToken = previewSessionTokenCache.get(appServerOwnerAppId);
   if (cachedToken) {
     return cachedToken;
   }
 
-  const pendingRequest = previewSessionPromiseCache.get(this.appId);
+  const pendingRequest = previewSessionPromiseCache.get(appServerOwnerAppId);
   if (pendingRequest) {
     return pendingRequest;
   }
 
   const requestPromise = (async () => {
-    const endpoint = `/appserver-preview/session?appId=${encodeURIComponent(this.appId)}`;
+    const endpoint = `/appserver-preview/session?appId=${encodeURIComponent(appServerOwnerAppId)}`;
     const response = await fetch(endpoint, {
       method: "GET",
       headers: {
@@ -138,15 +162,15 @@ const getPreviewSessionToken = async function(options = {}) {
       throw new Error("[AppServer-PreviewSession] Missing preview token in session response.");
     }
 
-    previewSessionTokenCache.set(this.appId, previewToken);
+    previewSessionTokenCache.set(appServerOwnerAppId, previewToken);
     return previewToken;
   })();
 
-  previewSessionPromiseCache.set(this.appId, requestPromise);
+  previewSessionPromiseCache.set(appServerOwnerAppId, requestPromise);
   try {
     return await requestPromise;
   } finally {
-    previewSessionPromiseCache.delete(this.appId);
+    previewSessionPromiseCache.delete(appServerOwnerAppId);
   }
 };
 
@@ -367,7 +391,8 @@ const buildRemoteRequestInit = function(
 };
 
 const invokeByPlatformProxy = async function(appServerAPIName, payload, options = {}) {
-  const endpoint = `/apps/invokeAppServerAPI?appId=${encodeURIComponent(this.appId)}&apiName=${encodeURIComponent(appServerAPIName)}`;
+  const appServerOwnerAppId = getAppServerOwnerAppId.call(this);
+  const endpoint = `/apps/invokeAppServerAPI?appId=${encodeURIComponent(appServerOwnerAppId)}&apiName=${encodeURIComponent(appServerAPIName)}`;
   const response = await fetch(
     `${this.config.apiBaseUrl}${endpoint}`,
     buildRemoteRequestInit.call(this, payload, options, {}, {
@@ -378,7 +403,8 @@ const invokeByPlatformProxy = async function(appServerAPIName, payload, options
 };
 
 const invokeByPreviewProxyOnce = async function(appServerAPIName, payload, options = {}, previewToken) {
-  const endpoint = `/appserver-preview/invokeAppServerAPI?appId=${encodeURIComponent(this.appId)}&apiName=${encodeURIComponent(appServerAPIName)}`;
+  const appServerOwnerAppId = getAppServerOwnerAppId.call(this);
+  const endpoint = `/appserver-preview/invokeAppServerAPI?appId=${encodeURIComponent(appServerOwnerAppId)}&apiName=${encodeURIComponent(appServerAPIName)}`;
   const response = await fetch(
     endpoint,
     buildRemoteRequestInit.call(this, payload, options, {
@@ -398,7 +424,7 @@ const invokeByPreviewProxy = async function(appServerAPIName, payload, options =
       throw error;
     }
 
-    clearPreviewSessionToken(this.appId);
+    clearPreviewSessionToken(getAppServerOwnerAppId.call(this));
     previewToken = await getPreviewSessionToken.call(this, { forceRefresh: true });
     return await invokeByPreviewProxyOnce.call(this, appServerAPIName, payload, options, previewToken);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tacoreai/web-sdk",
   "description": "This file is for app server package, not the real npm package",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -13,7 +13,7 @@
     "./app-server-runtime": "./database/core/apps/AppServerRuntime.js"
   },
   "scripts": {
-    "release": "npm version minor && git commit -am \"web-sdk update version\" && git push && npm publish",
+    "release": "npm version minor && git commit -am \"web-sdk update version\" && npm publish && git push",
     "release:beta": "npm version prerelease --preid beta --no-git-tag-version && git commit -am \"web-sdk update beta version\" && npm publish --tag beta"
   }
 }