@jclind/ingredient-parser 1.2.12 → 1.2.14

package/dist/src/api/http.js

@@ -5,17 +5,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createIngredientServerHttp = exports.spoonacularHttp = void 0;
 const axios_1 = __importDefault(require("axios"));
+// Webpack 5 can resolve require("axios") to the ESM entry without setting
+// __esModule, causing __importDefault to double-wrap it. The result is that
+// _axios is the module namespace object rather than the axios instance, so
+// .create lands one level deeper than expected.
+const axios = typeof axios_1.default.create === 'function'
+    ? axios_1.default
+    : axios_1.default.default;
 const DEFAULT_SERVER_URL = 'https://ingredient-parser-service-production-2635.up.railway.app';
-exports.spoonacularHttp = axios_1.default.create({
+exports.spoonacularHttp = axios.create({
     baseURL: 'https://api.spoonacular.com/food/ingredients/',
     headers: {
         'Content-type': 'application/json',
     },
+    timeout: 8000,
 });
-const createIngredientServerHttp = (serverUrl) => axios_1.default.create({
+const createIngredientServerHttp = (serverUrl) => axios.create({
     baseURL: serverUrl || DEFAULT_SERVER_URL,
     headers: {
         'Content-type': 'application/json',
     },
+    timeout: 8000,
 });
 exports.createIngredientServerHttp = createIngredientServerHttp;

package/dist/src/api/requests.d.ts

@@ -1,4 +1,5 @@
 import { IngredientData } from '../../types.js';
-export declare const parseAndEnrich: (ingredientString: string, spoonacularApiKey: string, serverUrl?: string) => Promise<IngredientData | null>;
-export declare const searchIngredient: (name: string, spoonacularAPIKey: string) => Promise<any>;
-export declare const getIngredientInformation: (ingrId: number, unit: boolean, spoonacularAPIKey: string) => Promise<any>;
+export declare const getIngredientFromServer: (name: string, serverUrl?: string) => Promise<IngredientData | null>;
+export declare const saveIngredientToServer: (name: string, ingredientData: IngredientData, serverUrl?: string) => void;
+export declare const searchIngredient: (name: string, spoonacularAPIKey: string) => Promise<import("axios").AxiosResponse<any, any, {}>>;
+export declare const getIngredientInformation: (ingrId: number, unit: boolean, spoonacularAPIKey: string) => Promise<import("axios").AxiosResponse<any, any, {}>>;

package/dist/src/api/requests.js

@@ -9,49 +9,61 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIngredientInformation = exports.searchIngredient = exports.parseAndEnrich = void 0;
+exports.getIngredientInformation = exports.searchIngredient = exports.saveIngredientToServer = exports.getIngredientFromServer = void 0;
+const axios_1 = require("axios");
 const http_js_1 = require("./http.js");
-const parseAndEnrich = (ingredientString, spoonacularApiKey, serverUrl) => __awaiter(void 0, void 0, void 0, function* () {
+function handleRequestError(error) {
+    var _a, _b, _c;
+    if ((0, axios_1.isAxiosError)(error)) {
+        const status = (_a = error.response) === null || _a === void 0 ? void 0 : _a.status;
+        const code = (_c = (_b = error.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.code;
+        if (status === 401 || code === 401)
+            throw new Error('API Key Not Valid');
+        if (status === 429)
+            throw new Error('Rate limit exceeded, please try again later');
+        if (error.response)
+            throw new Error('Error Occurred, Please Try Again');
+        throw new Error('Network error, please try again');
+    }
+    throw new Error('Network error, please try again');
+}
+const getIngredientFromServer = (name, serverUrl) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    try {
+        const serverHttp = (0, http_js_1.createIngredientServerHttp)(serverUrl);
+        const response = yield serverHttp.get(`/ingredient/${encodeURIComponent(name)}`);
+        return (_a = response.data.data) !== null && _a !== void 0 ? _a : null;
+    }
+    catch (_b) {
+        // Treat any server error as a cache miss and fall through to Spoonacular
+        return null;
+    }
+});
+exports.getIngredientFromServer = getIngredientFromServer;
+const saveIngredientToServer = (name, ingredientData, serverUrl) => {
     const serverHttp = (0, http_js_1.createIngredientServerHttp)(serverUrl);
-    const response = yield serverHttp.post('/parse', {
-        ingredientString,
-        spoonacularApiKey,
+    serverHttp
+        .post('/ingredient', { name, ingredientData })
+        .catch(() => {
+        // Fire-and-forget — a failed write doesn't affect the caller
     });
-    return (_a = response.data.data) !== null && _a !== void 0 ? _a : null;
-});
-exports.parseAndEnrich = parseAndEnrich;
+};
+exports.saveIngredientToServer = saveIngredientToServer;
 const searchIngredient = (name, spoonacularAPIKey) => __awaiter(void 0, void 0, void 0, function* () {
-    let searchedIngr;
     try {
-        searchedIngr = yield http_js_1.spoonacularHttp.get(`search?query=${name}&number=1&apiKey=${spoonacularAPIKey}`);
+        return yield http_js_1.spoonacularHttp.get(`search?query=${name}&number=1&apiKey=${spoonacularAPIKey}`);
     }
     catch (error) {
-        const res = error.response.data;
-        if (res.code === 401) {
-            throw new Error('API Key Not Valid');
-        }
-        else {
-            throw new Error('Error Occurred, Please Try Again');
-        }
+        handleRequestError(error);
     }
-    return searchedIngr;
 });
 exports.searchIngredient = searchIngredient;
 const getIngredientInformation = (ingrId, unit, spoonacularAPIKey) => __awaiter(void 0, void 0, void 0, function* () {
-    let ingrData;
     try {
-        ingrData = yield http_js_1.spoonacularHttp.get(`${ingrId}/information?amount=1&${unit ? 'unit=grams&' : ''}apiKey=${spoonacularAPIKey}`);
+        return yield http_js_1.spoonacularHttp.get(`${ingrId}/information?amount=1&${unit ? 'unit=grams&' : ''}apiKey=${spoonacularAPIKey}`);
     }
     catch (error) {
-        const res = error.response.data;
-        if (res.code === 401) {
-            throw new Error('API Key Not Valid');
-        }
-        else {
-            throw new Error('Error Occurred, Please Try Again');
-        }
+        handleRequestError(error);
     }
-    return ingrData;
 });
 exports.getIngredientInformation = getIngredientInformation;

package/dist/src/funcs/getIngredientInfo.d.ts

@@ -1,2 +1,2 @@
 import { IngredientData } from '../../types.js';
-export declare function getIngredientInfo(ingredientString: string, spoonacularAPIKey: string, serverUrl?: string): Promise<IngredientData | null>;
+export declare function getIngredientInfo(ingredientName: string, spoonacularAPIKey: string, serverUrl?: string): Promise<IngredientData | null>;

package/dist/src/funcs/getIngredientInfo.js

@@ -11,13 +11,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIngredientInfo = getIngredientInfo;
 const requests_js_1 = require("../api/requests.js");
-function getIngredientInfo(ingredientString, spoonacularAPIKey, serverUrl) {
+const getSpoonacularIngrData_js_1 = require("./getSpoonacularIngrData.js");
+function getIngredientInfo(ingredientName, spoonacularAPIKey, serverUrl) {
     return __awaiter(this, void 0, void 0, function* () {
-        try {
-            return yield (0, requests_js_1.parseAndEnrich)(ingredientString, spoonacularAPIKey, serverUrl);
-        }
-        catch (error) {
-            throw new Error(error.message || 'Failed to fetch ingredient data');
-        }
+        const cached = yield (0, requests_js_1.getIngredientFromServer)(ingredientName, serverUrl);
+        if (cached)
+            return cached;
+        const spoonacularData = yield (0, getSpoonacularIngrData_js_1.getSpoonacularIngrData)(ingredientName, spoonacularAPIKey);
+        if (!spoonacularData)
+            return null;
+        (0, requests_js_1.saveIngredientToServer)(ingredientName, spoonacularData, serverUrl);
+        return spoonacularData;
     });
 }

package/dist/src/funcs/getSpoonacularIngrData.js

@@ -15,15 +15,13 @@ function getSpoonacularIngrData(name, spoonacularAPIKey) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
         const searchedIngr = yield (0, requests_js_1.searchIngredient)(name, spoonacularAPIKey);
-        if (searchedIngr.error)
-            return searchedIngr;
         const ingrId = (_c = (_b = (_a = searchedIngr === null || searchedIngr === void 0 ? void 0 : searchedIngr.data) === null || _a === void 0 ? void 0 : _a.results[0]) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : null;
         if (!ingrId)
             throw new Error(`No Data Found, unknown ingredient: ${name}`);
-        const ingrDataGram = yield (0, requests_js_1.getIngredientInformation)(ingrId, true, spoonacularAPIKey);
-        const ingrDataSingleUnit = yield (0, requests_js_1.getIngredientInformation)(ingrId, false, spoonacularAPIKey);
-        if (ingrDataGram.error || ingrDataSingleUnit.error)
-            return ingrDataGram;
+        const [ingrDataGram, ingrDataSingleUnit] = yield Promise.all([
+            (0, requests_js_1.getIngredientInformation)(ingrId, true, spoonacularAPIKey),
+            (0, requests_js_1.getIngredientInformation)(ingrId, false, spoonacularAPIKey),
+        ]);
         const estimatedGramPrice = (_e = (_d = ingrDataGram.data.estimatedCost) === null || _d === void 0 ? void 0 : _d.value) !== null && _e !== void 0 ? _e : 0;
         const estimatedSingleUnitPrice = (_g = (_f = ingrDataSingleUnit.data.estimatedCost) === null || _f === void 0 ? void 0 : _f.value) !== null && _g !== void 0 ? _g : 0;
         const ingrData = Object.assign(Object.assign({}, ingrDataGram.data), { name, ingredientId: ingrId, estimatedPrices: { estimatedGramPrice, estimatedSingleUnitPrice } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jclind/ingredient-parser",
-  "version": "1.2.12",
+  "version": "1.2.14",
   "description": "Parses given sentence including ingredient information and attempts to return quantity, measurement and ingredient data",
   "keywords": [
     "recipe",