rename isSubscribed and dont import cloud on local

2026-03-03 04:00:31 +00:00 · 2025-12-02 22:54:49 -08:00
parent 10288ee239
commit 9d889198f8
16 changed files with 66 additions and 48 deletions
--- a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue
+++ b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue
@@ -1,7 +1,7 @@
 <template>
  <component
    :is="currentButton"
-    :key="isActiveSubscription ? 'queue' : 'subscribe'"
+    :key="isSubscribedOrIsNotCloud ? 'queue' : 'subscribe'"
  />
 </template>
 <script setup lang="ts">
@@ -11,9 +11,9 @@ import ComfyQueueButton from '@/components/actionbar/ComfyRunButton/ComfyQueueBu
 import SubscribeToRunButton from '@/platform/cloud/subscription/components/SubscribeToRun.vue'
 import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'

-const { isActiveSubscription } = useSubscription()
+const { isSubscribedOrIsNotCloud } = useSubscription()

 const currentButton = computed(() =>
-  isActiveSubscription.value ? ComfyQueueButton : SubscribeToRunButton
+  isSubscribedOrIsNotCloud.value ? ComfyQueueButton : SubscribeToRunButton
 )
 </script>
--- a/src/components/dialog/content/setting/CreditsPanel.vue
+++ b/src/components/dialog/content/setting/CreditsPanel.vue
@@ -15,7 +15,7 @@
          <UserCredit text-class="text-3xl font-bold" />
          <Skeleton v-if="loading" width="2rem" height="2rem" />
          <Button
-            v-else-if="isActiveSubscription"
+            v-else-if="isSubscribedOrIsNotCloud"
            :label="$t('credits.purchaseCredits')"
            :loading="loading"
            @click="handlePurchaseCreditsClick"
@@ -125,6 +125,7 @@ import UsageLogsTable from '@/components/dialog/content/setting/UsageLogsTable.v
 import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
 import { useExternalLink } from '@/composables/useExternalLink'
 import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useDialogService } from '@/services/dialogService'
 import { useCommandStore } from '@/stores/commandStore'
@@ -144,7 +145,11 @@ const authStore = useFirebaseAuthStore()
 const authActions = useFirebaseAuthActions()
 const commandStore = useCommandStore()
 const telemetry = useTelemetry()
-const { isActiveSubscription } = useSubscription()
+const subscription = isCloud ? useSubscription() : null
+const isSubscribedOrIsNotCloud = computed(() => {
+  if (!isCloud) return true
+  return subscription?.isSubscribedOrIsNotCloud.value ?? false
+})
 const loading = computed(() => authStore.loading)
 const balanceLoading = computed(() => authStore.isFetchingBalance)

--- a/src/components/topbar/CurrentUserPopover.test.ts
+++ b/src/components/topbar/CurrentUserPopover.test.ts
@@ -82,7 +82,7 @@ vi.mock('@/stores/firebaseAuthStore', () => ({
 const mockFetchStatus = vi.fn().mockResolvedValue(undefined)
 vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
  useSubscription: vi.fn(() => ({
-    isActiveSubscription: { value: true },
+    isSubscribedOrIsNotCloud: { value: true },
    fetchStatus: mockFetchStatus
  }))
 }))
--- a/src/components/topbar/CurrentUserPopover.vue
+++ b/src/components/topbar/CurrentUserPopover.vue
@@ -23,7 +23,10 @@
      </div>
    </div>

-    <div v-if="isActiveSubscription" class="flex items-center justify-between">
+    <div
+      v-if="isSubscribedOrIsNotCloud"
+      class="flex items-center justify-between"
+    >
      <div class="flex flex-col gap-1">
        <UserCredit text-class="text-2xl" />
        <Button
@@ -68,7 +71,7 @@
    />

    <Button
-      v-if="isActiveSubscription"
+      v-if="isSubscribedOrIsNotCloud"
      class="justify-start"
      :label="$t(planSettingsLabel)"
      icon="pi pi-receipt"
@@ -122,7 +125,7 @@ const { userDisplayName, userEmail, userPhotoUrl, handleSignOut } =
  useCurrentUser()
 const authActions = useFirebaseAuthActions()
 const dialogService = useDialogService()
-const { isActiveSubscription, fetchStatus } = useSubscription()
+const { isSubscribedOrIsNotCloud, fetchStatus } = useSubscription()

 const handleOpenUserSettings = () => {
  dialogService.showSettingsDialog('user')
--- a/src/composables/auth/useFirebaseAuthActions.ts
+++ b/src/composables/auth/useFirebaseAuthActions.ts
@@ -82,8 +82,10 @@ export const useFirebaseAuthActions = () => {
  )

  const purchaseCredits = wrapWithErrorHandlingAsync(async (amount: number) => {
-    const { isActiveSubscription } = useSubscription()
-    if (!isActiveSubscription.value) return
+    if (isCloud) {
+      const { isSubscribedOrIsNotCloud } = useSubscription()
+      if (!isSubscribedOrIsNotCloud.value) return
+    }

    const response = await authStore.initiateCreditPurchase({
      amount_micros: usdToMicros(amount),
--- a/src/composables/useCoreCommands.ts
+++ b/src/composables/useCoreCommands.ts
@@ -63,7 +63,7 @@ import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTyp

 import { useWorkflowTemplateSelectorDialog } from './useWorkflowTemplateSelectorDialog'

-const { isActiveSubscription, showSubscriptionDialog } = useSubscription()
+const { isSubscribedOrIsNotCloud, showSubscriptionDialog } = useSubscription()

 const moveSelectedNodesVersionAdded = '1.22.2'

@@ -475,7 +475,7 @@ export function useCoreCommands(): ComfyCommand[] {
        trigger_source?: ExecutionTriggerSource
      }) => {
        useTelemetry()?.trackRunButton(metadata)
-        if (!isActiveSubscription.value) {
+        if (!isSubscribedOrIsNotCloud.value) {
          showSubscriptionDialog()
          return
        }
@@ -498,7 +498,7 @@ export function useCoreCommands(): ComfyCommand[] {
        trigger_source?: ExecutionTriggerSource
      }) => {
        useTelemetry()?.trackRunButton(metadata)
-        if (!isActiveSubscription.value) {
+        if (!isSubscribedOrIsNotCloud.value) {
          showSubscriptionDialog()
          return
        }
@@ -520,7 +520,7 @@ export function useCoreCommands(): ComfyCommand[] {
        trigger_source?: ExecutionTriggerSource
      }) => {
        useTelemetry()?.trackRunButton(metadata)
-        if (!isActiveSubscription.value) {
+        if (!isSubscribedOrIsNotCloud.value) {
          showSubscriptionDialog()
          return
        }
--- a/src/platform/cloud/subscription/components/SubscribeButton.vue
+++ b/src/platform/cloud/subscription/components/SubscribeButton.vue
@@ -51,7 +51,7 @@ const emit = defineEmits<{
  subscribed: []
 }>()

-const { subscribe, isActiveSubscription, fetchStatus } = useSubscription()
+const { subscribe, isSubscribedOrIsNotCloud, fetchStatus } = useSubscription()
 const telemetry = useTelemetry()

 const isLoading = ref(false)
@@ -76,7 +76,7 @@ const startPollingSubscriptionStatus = () => {

      await fetchStatus()

-      if (isActiveSubscription.value) {
+      if (isSubscribedOrIsNotCloud.value) {
        stopPolling()
        telemetry?.trackMonthlySubscriptionSucceeded()
        emit('subscribed')
--- a/src/platform/cloud/subscription/components/SubscriptionPanel.vue
+++ b/src/platform/cloud/subscription/components/SubscriptionPanel.vue
@@ -4,7 +4,7 @@
      <div class="flex items-baseline gap-2">
        <span class="text-2xl font-inter font-semibold leading-tight">
          {{
-            isActiveSubscription
+            isSubscribedOrIsNotCloud
              ? $t('subscription.title')
              : $t('subscription.titleUnsubscribed')
          }}
@@ -27,7 +27,7 @@
                  }}</span>
                </div>
                <div
-                  v-if="isActiveSubscription"
+                  v-if="isSubscribedOrIsNotCloud"
                  class="text-sm text-text-secondary"
                >
                  <template v-if="isCancelled">
@@ -47,7 +47,7 @@
                </div>
              </div>
              <Button
-                v-if="isActiveSubscription"
+                v-if="isSubscribedOrIsNotCloud"
                :label="$t('subscription.manageSubscription')"
                severity="secondary"
                class="text-xs bg-interface-menu-component-surface-selected"
@@ -196,7 +196,7 @@
                      {{ $t('subscription.viewUsageHistory') }}
                    </a>
                    <Button
-                      v-if="isActiveSubscription"
+                      v-if="isSubscribedOrIsNotCloud"
                      :label="$t('subscription.addCredits')"
                      severity="secondary"
                      class="p-2 min-h-8 bg-interface-menu-component-surface-selected"
@@ -320,7 +320,7 @@ import { cn } from '@/utils/tailwindUtil'
 const { buildDocsUrl } = useExternalLink()

 const {
-  isActiveSubscription,
+  isSubscribedOrIsNotCloud,
  isCancelled,
  formattedRenewalDate,
  formattedEndDate,
--- a/src/platform/cloud/subscription/composables/useSubscription.ts
+++ b/src/platform/cloud/subscription/composables/useSubscription.ts
@@ -111,7 +111,7 @@ function useSubscriptionInternal() {
  const { startCancellationWatcher, stopCancellationWatcher } =
    useSubscriptionCancellationWatcher({
      fetchStatus,
-      isActiveSubscription: isSubscribedOrIsNotCloud,
+      isSubscribedOrIsNotCloud,
      subscriptionStatus,
      telemetry,
      shouldWatchCancellation
@@ -223,7 +223,7 @@ function useSubscriptionInternal() {

  return {
    // State
-    isActiveSubscription: isSubscribedOrIsNotCloud,
+    isSubscribedOrIsNotCloud,
    isCancelled,
    formattedRenewalDate,
    formattedEndDate,
--- a/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.ts
+++ b/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.ts
@@ -12,7 +12,7 @@ const CANCELLATION_BACKOFF_MULTIPLIER = 3 // 5s, 15s, 45s, 135s intervals

 type CancellationWatcherOptions = {
  fetchStatus: () => Promise<CloudSubscriptionStatusResponse | null | void>
-  isActiveSubscription: ComputedRef<boolean>
+  isSubscribedOrIsNotCloud: ComputedRef<boolean>
  subscriptionStatus: Ref<CloudSubscriptionStatusResponse | null>
  telemetry: Pick<TelemetryProvider, 'trackMonthlySubscriptionCancelled'> | null
  shouldWatchCancellation: () => boolean
@@ -20,7 +20,7 @@ type CancellationWatcherOptions = {

 export function useSubscriptionCancellationWatcher({
  fetchStatus,
-  isActiveSubscription,
+  isSubscribedOrIsNotCloud,
  subscriptionStatus,
  telemetry,
  shouldWatchCancellation
@@ -73,7 +73,7 @@ export function useSubscriptionCancellationWatcher({
    try {
      await fetchStatus()

-      if (!isActiveSubscription.value) {
+      if (!isSubscribedOrIsNotCloud.value) {
        if (!cancellationTracked.value) {
          cancellationTracked.value = true
          try {
--- a/src/scripts/app.ts
+++ b/src/scripts/app.ts
@@ -676,11 +676,17 @@ export class ComfyApp {
          'Payment Required: Please add credits to your account to use this node.'
        )
      ) {
-        const { isActiveSubscription } = useSubscription()
-        if (isActiveSubscription.value) {
+        if (!isCloud) {
          useDialogService().showTopUpCreditsDialog({
            isInsufficientCredits: true
          })
+        } else {
+          const { isSubscribedOrIsNotCloud } = useSubscription()
+          if (isSubscribedOrIsNotCloud.value) {
+            useDialogService().showTopUpCreditsDialog({
+              isInsufficientCredits: true
+            })
+          }
        }
      } else {
        useDialogService().showExecutionErrorDialog(detail)
--- a/src/services/dialogService.ts
+++ b/src/services/dialogService.ts
@@ -380,8 +380,10 @@ export const useDialogService = () => {
  function showTopUpCreditsDialog(options?: {
    isInsufficientCredits?: boolean
  }) {
-    const { isActiveSubscription } = useSubscription()
-    if (!isActiveSubscription.value) return
+    if (isCloud) {
+      const { isSubscribedOrIsNotCloud } = useSubscription()
+      if (!isSubscribedOrIsNotCloud.value) return
+    }

    return dialogStore.showDialog({
      key: 'top-up-credits',