@adland/react 0.7.1 → 0.8.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @adland/react
 
+## 0.8.0
+
+### Minor Changes
+
+- df8ba42: handle errors from api for no ad
+
+## 0.7.2
+
+### Patch Changes
+
+- Updated dependencies [f16990b]
+  - @adland/data@0.11.0
+
 ## 0.7.1
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adland/react",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -15,6 +15,11 @@
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     },
+    "./types": {
+      "types": "./dist/types.d.ts",
+      "import": "./dist/types.js",
+      "require": "./dist/types.cjs"
+    },
     "./package.json": "./package.json"
   },
   "peerDependencies": {
@@ -28,7 +33,7 @@
     "@types/react-dom": "^18.3.1",
     "lucide-react": "0.561.0",
     "tsup": "^8.0.1",
-    "@adland/data": "0.10.0"
+    "@adland/data": "0.11.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.13.1",

package/src/components/Ad.tsx

@@ -8,48 +8,9 @@ import BasicAdBody from "./BasicAdBody";
 import LinkAdContent from "./content/LinkAdContent";
 import MiniappAdContent from "./content/MiniappAdContent";
 import CastAdContent from "./content/CastAdContent";
-
-type Network = "testnet" | "mainnet";
-
-/**
- * Get the base URL for the network
- * Uses relative URL in browser (for local dev), otherwise defaults to production
- */
-const getBaseUrl = (network: Network): string => {
-  if (typeof window !== "undefined") {
-    // In browser - use relative URL for local development
-    return "";
-  }
-
-  if (network === "testnet") {
-    return "https://testnet.adland.space";
-  }
-
-  if (network === "mainnet") {
-    return "https://app.adland.space";
-  }
-
-  return "";
-};
-
-export interface AdProps extends React.HTMLAttributes<HTMLDivElement> {
-  /**
-   * The owner/creator of the ad
-   */
-  owner: string;
-  /**
-   * Unique identifier for the ad
-   */
-  slotId: string;
-  /**
-   * Network to use for tracking requests (currently only "testnet" is supported)
-   */
-  network?: Network;
-  /**
-   * Optional base URL override. If not provided, uses relative URL in browser or production URL in SSR
-   */
-  baseUrl?: string;
-}
+import { AdDataQueryError, AdProps } from "../types";
+import { getBaseUrl } from "../utils";
+import { adlandApiUrl } from "../utils/constants";
 
 /**
  * Simple Ad component with built-in view and click tracking
@@ -78,7 +39,7 @@ export function Ad({
     `ad-data-${owner}-${slotId}`,
     async () => {
       const res = await fetch(
-        `${networkBaseUrl}/api/data/owner/${owner.toLowerCase()}/slot/${slotId}`,
+        `${adlandApiUrl}/api/data/owner/${owner.toLowerCase()}/slot/${slotId}`,
         {
           method: "GET",
           headers: {
@@ -86,7 +47,18 @@ export function Ad({
           },
         },
       );
-      return res.json();
+
+      if (!res.ok) {
+        throw new Error(AdDataQueryError.NO_AD);
+      }
+
+      const data = await res.json();
+
+      if (data.error) {
+        throw new Error(data.error);
+      }
+
+      return data;
     },
     {
       enabled: !!owner && !!slotId,
@@ -94,6 +66,8 @@ export function Ad({
   );
   const networkBaseUrl = baseUrl ?? getBaseUrl(network);
 
+  console.log({ error, adData });
+
   const send = useCallback(
     (type: "view" | "click") => {
       const trackEndpoint = `${networkBaseUrl}/api/analytics/track`;
@@ -165,6 +139,16 @@ export function Ad({
           return <LoadingAdContent />;
         }
         if (error) {
+          // @ts-ignore
+          if (error instanceof Error) {
+            if (error.message === AdDataQueryError.NO_AD) {
+              return (
+                <EmtpyAdContent
+                  data={{ url: networkBaseUrl + `${owner}/${slotId}` }}
+                />
+              );
+            }
+          }
           return <ErrorAdContent error={error} />;
         }
         if (adData) {

package/src/index.ts

@@ -1,6 +1,6 @@
 // Main exports
 export { Ad } from "./components/Ad";
-export type { AdProps } from "./components/Ad";
+export type { AdProps, AdDataQueryResponse, AdDataQueryError } from "./types";
 
 // Utility exports
 export {

package/src/types.ts

@@ -0,0 +1,31 @@
+import { AdData } from "@adland/data";
+
+export type Network = "testnet" | "mainnet";
+
+export interface AdProps extends React.HTMLAttributes<HTMLDivElement> {
+  /**
+   * The owner/creator of the ad
+   */
+  owner: string;
+  /**
+   * Unique identifier for the ad
+   */
+  slotId: string;
+  /**
+   * Network to use for tracking requests (currently only "testnet" is supported)
+   */
+  network?: Network;
+  /**
+   * Optional base URL override. If not provided, uses relative URL in browser or production URL in SSR
+   */
+  baseUrl?: string;
+}
+
+export enum AdDataQueryError {
+  NO_AD = "NO_AD",
+}
+
+export interface AdDataQueryResponse {
+  error?: AdDataQueryError;
+  data?: AdData;
+}

package/src/utils/constants.ts

@@ -12,3 +12,8 @@ export const adCardIcon: Record<
   cast: MessageCircle,
   miniapp: LayoutGrid,
 };
+
+export const adlandApiUrl =
+  process.env.NODE_ENV === "development"
+    ? "http://localhost:3069"
+    : "https://api.adland.space";

package/src/utils/index.ts

@@ -0,0 +1,22 @@
+import { Network } from "../types";
+
+/**
+ * Get the base URL for the network
+ * Uses relative URL in browser (for local dev), otherwise defaults to production
+ */
+export const getBaseUrl = (network: Network): string => {
+  if (typeof window !== "undefined") {
+    // In browser - use relative URL for local development
+    return "";
+  }
+
+  if (network === "testnet") {
+    return "https://testnet.adland.space";
+  }
+
+  if (network === "mainnet") {
+    return "https://app.adland.space";
+  }
+
+  return "";
+};

package/tsup.config.ts

@@ -1,7 +1,10 @@
 import { defineConfig } from "tsup";
 
 export default defineConfig({
-  entry: ["src/index.ts"],
+  entry: {
+    index: "src/index.ts",
+    types: "src/types.ts",
+  },
   format: ["cjs", "esm"],
   dts: true,
   splitting: false,