cleanup

Makefile

@@ -1,3 +1,6 @@
 deploy-secrets:
 	fly secrets import < .env
 
+sync-products:
+	curl -X POST https://blade-and-brawn.fly.dev/products/sync
+

commerce/printful.ts

@@ -121,7 +121,7 @@ export namespace Printful {
             }[]
         }
 
-        export async function getSyncProduct(syncProductId: number): Promise<SyncProduct> {
+        export async function get(syncProductId: number): Promise<SyncProduct> {
             const payload: MetaDataSingle<SyncProduct> = await (
                 await fetch(`${Printful.API_URL}/store/products/${syncProductId}`, {
                     method: "GET",
@@ -135,7 +135,7 @@ export namespace Printful {
             return payload.result;
         }
 
-        export async function getSyncProducts(): Promise<SyncProduct[]> {
+        export async function getAll(): Promise<SyncProduct[]> {
             const payload: MetaDataMulti<SyncProduct["sync_product"]> = await (
                 await fetch(`${Printful.API_URL}/store/products`, {
                     method: "GET",
@@ -148,9 +148,15 @@ export namespace Printful {
 
             // need to fetch variants
             const syncProducts = await Promise.all(
-                payload.result.map(p => getSyncProduct(p.id))
+                payload.result.map(p => get(p.id))
             );
             return syncProducts;
         }
+
+
+        export function getVariantPreviewUrl(syncVariant: Printful.Products.SyncProduct["sync_variants"][number]): string {
+            const previewFile = syncVariant.files.find(f => f.type === "preview");
+            return previewFile?.preview_url ?? syncVariant.product.image;
+        }
     }
 }

commerce/product-records.ts

@@ -1,59 +0,0 @@
-import { Database } from "bun:sqlite";
-
-interface ProductRecord {
-    webflowProductId: number;
-    printfulProductId: number;
-}
-
-class ProductRecords {
-    private db: Database;
-
-    constructor() {
-        const dbPath = Bun.env.NODE_ENV === "production" ?
-            "/data/data.db" :
-            "./data/data.db";
-
-        this.db = new Database(dbPath);
-    }
-
-    findUsingWebflow(webflowProductId: number): ProductRecord | undefined {
-        const row = this.db.query(`
-          SELECT * FROM product_records WHERE webflowProductId = ?
-        `).get(webflowProductId);
-
-        return row as ProductRecord | undefined;
-    }
-
-    findUsingPrintful(printfulProductId: number): ProductRecord | undefined {
-        const row = this.db.query(`
-          SELECT * FROM product_records WHERE printfulProductId = ?
-        `).get(printfulProductId);
-
-        return row as ProductRecord | undefined;
-    }
-
-    deleteUsingWebflow(webflowProductId: number) {
-        this.db.run(`
-            DELETE FROM product_records WHERE webflowProductId = ?
-       `, [webflowProductId]);
-    }
-
-    deleteUsingPrintful(printfulProductId: number) {
-        this.db.run(`
-            DELETE FROM product_records WHERE printfulProductId = ?
-       `, [printfulProductId]);
-    }
-
-    add(record: ProductRecord): void {
-        this.db.run(`
-          INSERT OR IGNORE INTO product_records (webflowProductId, printfulProductId)
-          VALUES (?, ?)
-        `, [record.webflowProductId, record.printfulProductId]);
-    }
-
-    all(): ProductRecord[] {
-        return this.db.query(`SELECT * FROM product_records`).all() as ProductRecord[];
-    }
-}
-
-export const productRecords = new ProductRecords();

commerce/webflow.ts

@@ -1,4 +1,3 @@
-import { productRecords } from "./product-records";
 import { Printful } from "./printful"
 
 export namespace Webflow {
@@ -15,7 +14,7 @@ export namespace Webflow {
             .replace(/^([^a-z0-9_])/, '_$1');  // if it starts with an invalid char, prefix underscore
     };
 
-    namespace Products {
+    export namespace Products {
         export interface Sku {
             fieldData: {
                 name: string;
@@ -30,12 +29,14 @@ export namespace Webflow {
             }
         }
 
-        export interface CreateProduct {
+        export interface UpsertProduct {
             product: {
                 fieldData: {
                     name: string;
                     slug: string;
                     description: string;
+                    shippable?: boolean;
+                    "tax-category"?: string;
                     "sku-properties": {
                         id: string;
                         name: string;
@@ -48,13 +49,10 @@ export namespace Webflow {
                 }
             };
             sku: Sku;
-            publishStatus: string;
+            publishStatus?: "staging" | "live";
-        }
         }
 
-    export async function deleteProductUsingPrintful(printfulProductId: number) {
+        export async function remove(webflowProductId: string) {
-        const webflowProductId = productRecords.findUsingPrintful(printfulProductId)?.webflowProductId;
-        if (webflowProductId) {
             const res = await fetch(`${Webflow.API_COLLECTIONS_URL}/items/${webflowProductId}`, {
                 method: "DELETE",
                 headers: {
@@ -63,15 +61,20 @@ export namespace Webflow {
                 },
                 body: JSON.stringify({})
             });
-            productRecords.deleteUsingWebflow(webflowProductId);
-        }
         }
 
-    export async function updateProductUsingPrintful(printfulProduct: Printful.Products.SyncProduct) {
+        export async function exists(webflowProductId: string): Promise<boolean> {
-        const webflowProductId = productRecords.findUsingPrintful(printfulProduct.sync_product.id)?.webflowProductId;
+            let findProductResponse = await fetch(`${Webflow.API_SITES_URL}/products/${webflowProductId}`, {
-        if (!webflowProductId) {
+                method: "GET",
-            throw new Error("Product is not recognized");
+                headers: {
+                    "Authorization": `bearer ${Bun.env.WEBFLOW_AUTH}`,
                 }
+            });
+            return findProductResponse.status === 200;
+        }
+
+        export async function updateUsingPrintful(printfulProduct: Printful.Products.SyncProduct) {
+            const webflowProductId = printfulProduct.sync_product.external_id;
 
             const printfulVariants = printfulProduct.sync_variants;
             const webflowVariants: Products.Sku[] = [];
@@ -89,8 +92,7 @@ export namespace Webflow {
                             "unit": printfulVariant.currency,
                             "currency": printfulVariant.currency
                         },
-                    // TODO: sync image
+                        "main-image": Printful.Products.getVariantPreviewUrl(printfulVariant)
-                    "main-image": "https://www.example.com/image.jpg"
                     }
                 });
             }
@@ -109,6 +111,8 @@ export namespace Webflow {
                         "fieldData": {
                             "name": printfulProduct.sync_product.name,
                             "slug": formatSlug(printfulProduct.sync_product.name),
+                            "shippable": true,
+                            "tax-category": "standard-taxable",
                             "sku-properties": [
                                 {
                                     "id": "color",
@@ -131,8 +135,8 @@ export namespace Webflow {
                             ]
                         }
                     },
-                "sku": webflowVariants[0]
+                    "sku": webflowVariants[0],
-            })
+                } as Products.UpsertProduct)
             });
             updateProductResponse = await updateProductResponse.json();
 
@@ -160,7 +164,7 @@ export namespace Webflow {
             }
         }
 
-    export async function createProductUsingPrintful(printfulProduct: Printful.Products.SyncProduct) {
+        export async function createUsingPrintful(printfulProduct: Printful.Products.SyncProduct) {
             const printfulVariants = printfulProduct.sync_variants;
 
             const webflowVariants: Products.Sku[] = [];
@@ -178,8 +182,7 @@ export namespace Webflow {
                             "unit": printfulVariant.currency,
                             "currency": printfulVariant.currency
                         },
-                    // TODO: sync image
+                        "main-image": Printful.Products.getVariantPreviewUrl(printfulVariant)
-                    // "main-image": "https://www.example.com/image.jpg"
                     }
                 });
             }
@@ -199,6 +202,8 @@ export namespace Webflow {
                         "fieldData": {
                             "name": printfulProduct.sync_product.name,
                             "slug": formatSlug(printfulProduct.sync_product.name),
+                            "shippable": true,
+                            "tax-category": "standard-taxable",
                             "sku-properties": [
                                 {
                                     "id": "color",
@@ -222,7 +227,7 @@ export namespace Webflow {
                         }
                     },
                     "sku": webflowVariants[0],
-            })
+                } as Products.UpsertProduct)
             }))?.json();
 
             if (!addProductResponse?.product?.id) {
@@ -267,9 +272,7 @@ export namespace Webflow {
                 })
             });
             modifyPrintfulProductResponse = await modifyPrintfulProductResponse.json();
-
+        }
-        // CACHE WEBFLOW/PRINTFUL PRODUCT ASSOCIATION
-        productRecords.add({ printfulProductId, webflowProductId });
     }
 }
 

main.ts

@@ -1,6 +1,5 @@
 import { calcAttributeLevels, calcPlayerLevel, computeLevels } from "./calculator/calc.ts";
 import { Activity, BenchmarkPerformance, Player } from "./calculator/util.ts";
-import { productRecords } from "./commerce/product-records.ts";
 import { Printful } from "./commerce/printful.ts"
 import { Webflow } from "./commerce/webflow.ts";
 
@@ -30,6 +29,7 @@ export class ClientResponse extends Response {
 }
 
 const server = Bun.serve({
+    idleTimeout: 180,
     routes: {
         "/calc": {
             OPTIONS() {
@@ -66,27 +66,21 @@ const server = Bun.serve({
                 return new ClientResponse(undefined, { status: 204 });
             },
             async POST(req) {
-                const printfulProducts = await Printful.Products.getSyncProducts();
+                const printfulProducts = await Printful.Products.getAll();
 
                 // handle update/create
                 for (const printfulProduct of printfulProducts) {
-                    const productRecord = productRecords.findUsingPrintful(printfulProduct.sync_product.id);
+                    const webflowProductExists = await Webflow.Products.exists(printfulProduct.sync_product.external_id);
-                    if (productRecord) {
+                    if (webflowProductExists) {
-                        await Webflow.updateProductUsingPrintful(printfulProduct);
+                        await Webflow.Products.updateUsingPrintful(printfulProduct);
                     }
                     else {
-                        await Webflow.createProductUsingPrintful(printfulProduct);
+                        await Webflow.Products.createUsingPrintful(printfulProduct);
                     }
+                    console.log("DONE");
                 }
 
-                // handle delete
+                // handle delete (TODO)
-                // for (const productRecord of productRecords.all()) {
-                //     const existsInPrintful = printfulProducts
-                //         .some(printfulProduct => printfulProduct.sync_product.id === productRecord.printfulProductId);
-                //     if (!existsInPrintful) {
-                //         await Webflow.deleteProductUsingPrintful(productRecord.printfulProductId);
-                //     }
-                // }
 
                 return ClientResponse.json({});
             }
@@ -101,20 +95,19 @@ const server = Bun.serve({
                     switch (payload.type) {
                         // ADD/UPDATE
                         case Printful.Webhook.Event.ProductUpdated: {
-                            const printfulProduct = await Printful.Products.getSyncProduct(payload.data.sync_product.id);
+                            const printfulProduct = await Printful.Products.get(payload.data.sync_product.id);
-                            const productRecord = productRecords.findUsingPrintful(payload.data.sync_product.id);
+                            const webflowProductExists = await Webflow.Products.exists(printfulProduct.sync_product.external_id);
-
+                            if (webflowProductExists) {
-                            if (productRecord) {
+                                await Webflow.Products.updateUsingPrintful(printfulProduct);
-                                await Webflow.updateProductUsingPrintful(printfulProduct);
                             }
                             else {
-                                await Webflow.createProductUsingPrintful(printfulProduct);
+                                await Webflow.Products.createUsingPrintful(printfulProduct);
                             }
                             break;
                         }
                         // DELETE
                         case Printful.Webhook.Event.ProductDeleted: {
-                            await Webflow.deleteProductUsingPrintful(payload.data.sync_product.id);
+                            await Webflow.Products.remove(payload.data.sync_product.external_id);
                             break;
                         }
                     }