four-flap-meme-sdk 4.3.3 → 4.3.5

package/dist/bundle/four-meme/core/create-token.js

@@ -12,6 +12,19 @@ import { createChainContext, loginFourClient, resolveTokenImage } from '../core-
 import { TM2_ABI } from './constants.js';
 import { fourCreateApiBody, fourCreateValueWei, readLaunchFeeWei, resolveCreateRaisedToken, signQuoteApproveIfNeeded, } from './create-token-quote.js';
 import { isNativeRaisedToken } from '../../../domains/four/raised-token.js';
+function launchProfitIfConfigured(buyAmount, nativeRaised) {
+    if (!nativeRaised || buyAmount <= 0n || !shouldExtractProfit())
+        return null;
+    try {
+        const profit = calculateProfit(buyAmount).profit;
+        if (profit <= 0n)
+            return null;
+        return { profit, recipient: getProfitRecipient() };
+    }
+    catch {
+        return null;
+    }
+}
 export async function createTokenWithBundleBuyMerkle(params) {
     const { privateKeys, buyAmounts, tokenInfo, config } = params;
     if (privateKeys.length !== 1) {
@@ -31,6 +44,10 @@ export async function createTokenWithBundleBuyMerkle(params) {
         ? String(tokenInfo.preSale)
         : String(buyAmounts[0] ?? '0');
     const raisedToken = await resolveCreateRaisedToken(fourClient, tokenInfo);
+    const originalBuyAmount = isNativeRaisedToken(raisedToken)
+        ? ethers.parseEther(effectivePreSaleStr || '0')
+        : 0n;
+    const launchProfit = launchProfitIfConfigured(originalBuyAmount, isNativeRaisedToken(raisedToken));
     const createResp = await fourClient.createToken(accessToken, fourCreateApiBody({
         name: tokenInfo.name,
         shortName: tokenInfo.symbol,
@@ -51,11 +68,7 @@ export async function createTokenWithBundleBuyMerkle(params) {
     const txType = getTxType(config);
     const signedTxs = [];
     const tmCreateAddr = ADDRESSES.BSC.TokenManagerOriginal;
-    const extractProfit = shouldExtractProfit() && isNativeRaisedToken(raisedToken);
-    const originalBuyAmount = isNativeRaisedToken(raisedToken)
-        ? ethers.parseEther(effectivePreSaleStr || '0')
-        : 0n;
-    const profitAmount = extractProfit ? calculateProfit(originalBuyAmount).profit : 0n;
+    const profitAmount = launchProfit?.profit ?? 0n;
     const bribeAmount = getBribeAmount(config);
     const needBribeTx = bribeAmount > 0n;
     const tmCreate = new ethers.Contract(tmCreateAddr, TM2_ABI, devWallet);
@@ -92,13 +105,13 @@ export async function createTokenWithBundleBuyMerkle(params) {
     };
     signedTxs.push(await devWallet.signTransaction(createTxRequest));
     let profitHopWallets;
-    if (extractProfit && profitAmount > 0n) {
+    if (launchProfit && profitAmount > 0n) {
         const profitNonce = await nonceManager.getNextNonce(devWallet);
         const profitHopResult = await buildProfitHopTransactions({
             provider,
             payerWallet: devWallet,
             profitAmount,
-            profitRecipient: getProfitRecipient(),
+            profitRecipient: launchProfit.recipient,
             hopCount: PROFIT_HOP_COUNT,
             gasPrice,
             chainId,
@@ -109,11 +122,11 @@ export async function createTokenWithBundleBuyMerkle(params) {
         profitHopWallets = profitHopResult.hopWallets;
     }
     nonceManager.clearTemp();
-    const metadata = extractProfit && profitAmount > 0n
+    const metadata = launchProfit && profitAmount > 0n
         ? {
             totalBuyAmount: ethers.formatEther(originalBuyAmount),
             profitAmount: ethers.formatEther(profitAmount),
-            profitRecipient: getProfitRecipient(),
+            profitRecipient: launchProfit.recipient,
             buyerCount: 1,
         }
         : undefined;

package/dist/core/clients/four-client-fallback.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/core/clients/four-client-fallback.test.js

@@ -0,0 +1,44 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { FourClient } from './four.js';
+describe('FourClient private API rate-limit fallback', () => {
+    afterEach(() => {
+        vi.unstubAllGlobals();
+    });
+    it('retries generateNonce on the official API after -1013', async () => {
+        const calls = [];
+        vi.stubGlobal('fetch', vi.fn(async (input) => {
+            const url = String(input);
+            calls.push(url);
+            if (url.includes('bscfourapi.emit.tools')) {
+                return new Response(JSON.stringify({ code: -1013, msg: 'Too many requests, banned for 15 minutes' }), {
+                    status: 429,
+                });
+            }
+            return new Response(JSON.stringify({ code: 0, data: 'nonce-1' }));
+        }));
+        const nonce = await new FourClient().generateNonce({
+            accountAddress: `0x${'11'.repeat(20)}`,
+            verifyType: 'LOGIN',
+            networkCode: 'BSC',
+        });
+        expect(nonce).toBe('nonce-1');
+        expect(calls.some((url) => url.includes('four.meme'))).toBe(true);
+    });
+    it('retries generateNonce when the proxy returns HTML', async () => {
+        vi.stubGlobal('fetch', vi.fn(async (input) => {
+            const url = String(input);
+            if (url.includes('bscfourapi.emit.tools')) {
+                return new Response('<!doctype html><html></html>', {
+                    status: 200,
+                    headers: { 'Content-Type': 'text/html' },
+                });
+            }
+            return new Response(JSON.stringify({ code: 0, data: 'nonce-2' }));
+        }));
+        await expect(new FourClient().generateNonce({
+            accountAddress: `0x${'11'.repeat(20)}`,
+            verifyType: 'LOGIN',
+            networkCode: 'BSC',
+        })).resolves.toBe('nonce-2');
+    });
+});

package/dist/core/clients/four.d.ts

@@ -11,10 +11,8 @@ export type FourConfig = {
      */
     baseUrl?: string;
     /**
-     * 图片上传备用代理 URL 列表
-     *
-     * 当主 baseUrl 触发 IP 限流（code -1038）时，自动依次尝试备用端点。
-     * 每个 URL 格式同 baseUrl，例如 'https://bscfourapi2.emit.tools'
+     * 图片上传 / 登录 / 发币 API 备用 URL。
+     * 主 baseUrl 触发 -1038 / -1013 时依次尝试。
      */
     uploadFallbackUrls?: string[];
 };
@@ -113,6 +111,8 @@ export declare class FourClient {
     private baseUrl;
     private uploadUrls;
     constructor(cfg?: FourConfig);
+    private attachApiCode;
+    private postPrivateJson;
     generateNonce(req: GenerateNonceReq): Promise<string>;
     loginDex(body: LoginReq): Promise<string>;
     /**
@@ -127,15 +127,13 @@ export declare class FourClient {
      * 执行单次上传请求
      */
     private doUpload;
-    /**
-     * 判断是否为 IP 限流错误（code: -1038）
-     */
     private isRateLimitError;
     /**
      * 判断是否为 CORS 或网络错误
      * 浏览器直连官方 API 时常见（fetch 会抛出 TypeError: Failed to fetch）
      */
     private isCorsOrNetworkError;
+    private isInvalidJsonError;
     private getFilenameFromBlob;
     createToken(accessToken: string, req: CreateTokenReq): Promise<CreateTokenResp>;
     getPublicConfig(): Promise<FourPublicConfig>;

package/dist/core/clients/four.js

@@ -107,13 +107,11 @@ async function hashBlob(blob) {
     const hashArray = Array.from(new Uint8Array(hashBuffer));
     return hashArray.map((b) => b.toString(16).padStart(2, '0')).join('');
 }
-/** IP 限流错误码 */
-const RATE_LIMIT_CODE = -1038;
+/** Four.meme 限流：-1038 每日上传配额，-1013 15 分钟封禁 */
+const RATE_LIMIT_CODES = new Set([-1038, -1013]);
 /**
- * Four.meme 官方 API 地址（作为内置备用端点）
- *
- * - 在 Node.js/服务端环境中：无 CORS 限制，直连走用户自己的 IP，不消耗 Worker 配额
- * - 在浏览器环境中：可能被 CORS 拦截，但作为最后的 fallback 仍值得尝试
+ * Four.meme 官方 API。nonce/login 浏览器可直连；create/upload 需 `meme-web-access`，
+ * 官方 CORS 不放行该头，浏览器应走自有代理。
  */
 const FOUR_MEME_OFFICIAL_API = 'https://four.meme/meme-api';
 export class FourClient {
@@ -133,30 +131,49 @@ export class FourClient {
         // 去重（如果用户 baseUrl 就是官方地址，避免重复请求）
         this.uploadUrls = [...new Set(this.uploadUrls)];
     }
+    attachApiCode(err, code) {
+        const n = Number(code);
+        if (Number.isFinite(n))
+            err.apiCode = n;
+        return err;
+    }
+    async postPrivateJson(path, failLabel, init) {
+        let lastError = null;
+        for (let i = 0; i < this.uploadUrls.length; i++) {
+            const baseUrl = this.uploadUrls[i];
+            try {
+                const r = await fetch(`${baseUrl}${path}`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json', ...(init.headers || {}) },
+                    body: init.body,
+                });
+                const j = (await r.json());
+                if (j.code !== '0' && j.code !== 0) {
+                    throw this.attachApiCode(new Error(`${failLabel}: ${JSON.stringify(j)}`), j.code);
+                }
+                return j.data;
+            }
+            catch (e) {
+                const err = e instanceof Error ? e : new Error(getErrorMessageFromUnknown(e));
+                lastError = err;
+                const canRetry = i < this.uploadUrls.length - 1;
+                if (canRetry && (this.isRateLimitError(err) || this.isCorsOrNetworkError(err) || this.isInvalidJsonError(err))) {
+                    continue;
+                }
+                break;
+            }
+        }
+        throw lastError ?? new Error(failLabel);
+    }
     async generateNonce(req) {
-        const r = await fetch(`${this.baseUrl}/v1/private/user/nonce/generate`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
+        return this.postPrivateJson('/v1/private/user/nonce/generate', 'generateNonce failed', {
             body: JSON.stringify(req),
         });
-        const j = await r.json();
-        // code 可能是字符串 '0' 或数字 0
-        if (j.code !== '0' && j.code !== 0) {
-            throw new Error(`generateNonce failed: ${JSON.stringify(j)}`);
-        }
-        return j.data;
     }
     async loginDex(body) {
-        const r = await fetch(`${this.baseUrl}/v1/private/user/login/dex`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
+        return this.postPrivateJson('/v1/private/user/login/dex', 'login failed', {
             body: JSON.stringify(body),
         });
-        const j = await r.json();
-        if (j.code !== '0' && j.code !== 0) {
-            throw new Error(`login failed: ${JSON.stringify(j)}`);
-        }
-        return j.data; // access_token
     }
     /**
      * 上传图片到 Four.meme
@@ -189,10 +206,6 @@ export class FourClient {
                 lastError = err;
                 const canRetry = i < this.uploadUrls.length - 1;
                 if (this.isRateLimitError(err) && canRetry) {
-                    // IP 限流 → 切下一个端点
-                    const nextUrl = this.uploadUrls[i + 1];
-                    const nextLabel = nextUrl === FOUR_MEME_OFFICIAL_API ? '官方直连' : `备用端点 #${i + 2}`;
-                    console.warn(`[FourClient] 端点 ${baseUrl} 触发 IP 限流(100次/天)，切换到${nextLabel}...`);
                     continue;
                 }
                 if (this.isCorsOrNetworkError(err) && canRetry) {
@@ -207,8 +220,7 @@ export class FourClient {
         // 所有端点都失败
         const isRateLimit = lastError && this.isRateLimitError(lastError);
         if (isRateLimit) {
-            throw new Error(`图片上传失败：所有端点均触发 IP 限流(每IP每天100次)。` +
-                `请等待次日重置，或在 FourConfig.uploadFallbackUrls 中添加不同 IP 的备用代理。` +
+            throw new Error(`图片上传失败：Four.meme 限流（每日配额或 15 分钟封禁）。请稍后再试。` +
                 `\n原始错误: ${getErrorMessageFromUnknown(lastError)}`);
         }
         if (lastError !== null && lastError !== undefined)
@@ -234,17 +246,12 @@ export class FourClient {
         }
         return j.data; // imgUrl
     }
-    /**
-     * 判断是否为 IP 限流错误（code: -1038）
-     */
     isRateLimitError(e) {
-        if (e !== null &&
-            typeof e === 'object' &&
-            'apiCode' in e &&
-            e.apiCode === RATE_LIMIT_CODE) {
+        const code = Number(e.apiCode);
+        if (RATE_LIMIT_CODES.has(code))
             return true;
-        }
-        return getErrorMessageFromUnknown(e).includes('-1038');
+        const msg = getErrorMessageFromUnknown(e);
+        return RATE_LIMIT_CODES.has(Number(msg.match(/"code"\s*:\s*(-?\d+)/)?.[1])) || /too many requests|banned for/i.test(msg);
     }
     /**
      * 判断是否为 CORS 或网络错误
@@ -256,6 +263,9 @@ export class FourClient {
         const msg = getErrorMessageFromUnknown(e).toLowerCase();
         return msg.includes('failed to fetch') || msg.includes('network') || msg.includes('cors');
     }
+    isInvalidJsonError(e) {
+        return e instanceof SyntaxError || /unexpected token|not valid json/i.test(getErrorMessageFromUnknown(e));
+    }
     getFilenameFromBlob(blob) {
         const mimeToExt = {
             'image/jpeg': 'jpg',
@@ -271,16 +281,10 @@ export class FourClient {
     async createToken(accessToken, req) {
         const raisedToken = req.raisedToken ?? (await this.resolveRaisedToken(req.symbol));
         const body = buildCreateTokenReq(req, raisedToken);
-        const r = await fetch(`${this.baseUrl}/v1/private/token/create`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json', 'meme-web-access': accessToken },
+        return this.postPrivateJson('/v1/private/token/create', 'createToken failed', {
+            headers: { 'meme-web-access': accessToken },
             body: JSON.stringify(body),
         });
-        const j = await r.json();
-        if (j.code !== '0' && j.code !== 0) {
-            throw new Error(`createToken failed: ${JSON.stringify(j)}`);
-        }
-        return j.data;
     }
     async getPublicConfig() {
         const urls = [...new Set([this.baseUrl, FOUR_MEME_OFFICIAL_API])];
@@ -392,16 +396,10 @@ export class FourClient {
         return last;
     }
     async createOpenFourToken(accessToken, req) {
-        const r = await fetch(`${this.baseUrl}/v1/private/token_template/token/create`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json', 'meme-web-access': accessToken },
+        const data = await this.postPrivateJson('/v1/private/token_template/token/create', 'createOpenFourToken failed', {
+            headers: { 'meme-web-access': accessToken },
             body: JSON.stringify(req),
         });
-        const j = await r.json();
-        if (j.code !== '0' && j.code !== 0) {
-            throw new Error(`createOpenFourToken failed: ${JSON.stringify(j)}`);
-        }
-        const data = j.data;
         const first = Array.isArray(data) ? data[0] : data;
         return first;
     }

package/dist/core/nonce/nonce-manager.js

@@ -1,5 +1,21 @@
 import '../tx/wallet-sign-patch.js';
 import { CHAINS } from '../constants/index.js';
+function parseRpcQuantity(value) {
+    if (typeof value === 'number' && Number.isFinite(value))
+        return Math.max(0, Math.floor(value));
+    if (typeof value === 'bigint') {
+        const n = Number(value);
+        return Number.isFinite(n) && n > 0 ? n : 0;
+    }
+    const s = String(value ?? '').trim();
+    if (!s)
+        return 0;
+    if (/^0x[0-9a-f]+$/i.test(s))
+        return parseInt(s, 16) || 0;
+    if (/^\d+$/.test(s))
+        return Number(s);
+    return parseInt(s, 16) || 0;
+}
 function asBatchSendProvider(provider) {
     return provider;
 }
@@ -195,7 +211,7 @@ export class NonceManager {
                 const byId = new Map();
                 for (const row of rawResults) {
                     const id = Number(row.id);
-                    byId.set(id, row.result ? parseInt(row.result, 16) : 0);
+                    byId.set(id, parseRpcQuantity(row.result));
                 }
                 queryResults = uniqueQueries.map((_, idx) => Math.max(byId.get(idx * 2 + 1) || 0, byId.get(idx * 2 + 2) || 0));
             }

package/dist/domains/lp-inspect/inspect-tax.js

@@ -61,6 +61,8 @@ async function readGenericTokenTaxBps(token, provider) {
     for (const item of reads) {
         if (item.status !== 'fulfilled' || typeof item.value !== 'number')
             continue;
+        if (item.value === 100)
+            continue;
         if (item.value > maxBps)
             maxBps = item.value;
     }
@@ -70,6 +72,8 @@ export async function readBscOuterTaxBps(token, rpcUrl) {
     try {
         if (await isTaxToken(token, rpcUrl)) {
             const fee = Number((await getTaxTokenInfo(token, rpcUrl)).config.feeRate);
+            if (Number.isFinite(fee) && fee > 0 && fee <= 10000)
+                return Math.round(fee);
             const bps = normalizeFeeToBps(fee);
             if (bps)
                 return bps;

package/dist/domains/lp-inspect/inspect-tax.test.js

@@ -34,6 +34,9 @@ describe('normalizeFeeToBps', () => {
         expect(normalizeFeeToBps(500)).toBe(500);
         expect(normalizeFeeToBps(0)).toBeUndefined();
     });
+    it('does not treat generic leftover 100 as pancake tax in the max fold', () => {
+        expect(normalizeFeeToBps(100)).toBe(100);
+    });
 });
 describe('flapV8TaxBps', () => {
     it('reads inner flap tax', () => {

package/dist/domains/lp-inspect/inspect.js

@@ -105,11 +105,14 @@ export async function inspectTokenLP(token, opts) {
                     price: formatBalance(st.price, shouldFormat),
                     taxRate, // ✅ 包含税率
                 };
-                // ✅ 同时设置顶层税率，方便统一读取
-                if (taxRate && taxRate > 0) {
-                    result.taxRate = taxRate;
+                const reserveBn = BigInt(st.reserve ?? 0n);
+                if (reserveBn > 0n) {
+                    if (taxRate && taxRate > 0) {
+                        result.taxRate = taxRate;
+                    }
+                    return result;
                 }
-                return result;
+                // 空内盘：继续查外盘，避免假内盘把 allPools 吃掉；Portal 残留税也不写进外盘
             }
         }
         catch {
@@ -344,7 +347,7 @@ export async function inspectTokenLP(token, opts) {
                 const stV7 = await flap.getTokenV7(token);
                 taxRate = Number(stV7.taxRate ?? 0n);
             }
-            if (taxRate > 0) {
+            if (taxRate > 0 && taxRate !== 100) {
                 result.taxRate = taxRate;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "4.3.3",
+  "version": "4.3.5",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",