@drttix/drt-sdk 0.6.4 → 0.6.15

package/dist/esm/src/generated/scanner/core/request.d.ts

@@ -1,8 +1,8 @@
-import type { ApiRequestOptions } from './ApiRequestOptions';
-import type { ApiResult } from './ApiResult';
-import { CancelablePromise } from './CancelablePromise';
-import type { OnCancel } from './CancelablePromise';
-import type { OpenAPIConfig } from './OpenAPI';
+import type { ApiRequestOptions } from "./ApiRequestOptions";
+import type { ApiResult } from "./ApiResult";
+import { CancelablePromise } from "./CancelablePromise";
+import type { OnCancel } from "./CancelablePromise";
+import type { OpenAPIConfig } from "./OpenAPI";
 export declare const isDefined: <T>(value: T | null | undefined) => value is Exclude<T, null | undefined>;
 export declare const isString: (value: any) => value is string;
 export declare const isStringWithValue: (value: any) => value is string;
@@ -20,11 +20,8 @@ export declare const getResponseHeader: (response: Response, responseHeader?: st
 export declare const getResponseBody: (response: Response) => Promise<any>;
 export declare const catchErrorCodes: (options: ApiRequestOptions, result: ApiResult) => void;
 /**
- * Request method
- * @param config The OpenAPI configuration object
- * @param options The request options from the service
- * @returns CancelablePromise<T>
- * @throws ApiError
+ * Wraps sendRequest to capture cookies on login
+ * and attach cookies on other requests
  */
 export declare const request: <T>(config: OpenAPIConfig, options: ApiRequestOptions) => CancelablePromise<T>;
 export {};

package/dist/esm/src/generated/scanner/core/request.js

@@ -2,24 +2,24 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import { ApiError } from './ApiError.js';
-import { CancelablePromise } from './CancelablePromise.js';
+import { ApiError } from "./ApiError.js";
+import { CancelablePromise } from "./CancelablePromise.js";
 export const isDefined = (value) => {
     return value !== undefined && value !== null;
 };
 export const isString = (value) => {
-    return typeof value === 'string';
+    return typeof value === "string";
 };
 export const isStringWithValue = (value) => {
-    return isString(value) && value !== '';
+    return isString(value) && value !== "";
 };
 export const isBlob = (value) => {
-    return (typeof value === 'object' &&
-        typeof value.type === 'string' &&
-        typeof value.stream === 'function' &&
-        typeof value.arrayBuffer === 'function' &&
-        typeof value.constructor === 'function' &&
-        typeof value.constructor.name === 'string' &&
+    return (typeof value === "object" &&
+        typeof value.type === "string" &&
+        typeof value.stream === "function" &&
+        typeof value.arrayBuffer === "function" &&
+        typeof value.constructor === "function" &&
+        typeof value.constructor.name === "string" &&
         /^(Blob|File)$/.test(value.constructor.name) &&
         /^(Blob|File)$/.test(value[Symbol.toStringTag]));
 };
@@ -32,7 +32,7 @@ export const base64 = (str) => {
     }
     catch (err) {
         // @ts-ignore
-        return Buffer.from(str).toString('base64');
+        return Buffer.from(str).toString("base64");
     }
 };
 export const getQueryString = (params) => {
@@ -43,11 +43,11 @@ export const getQueryString = (params) => {
     const process = (key, value) => {
         if (isDefined(value)) {
             if (Array.isArray(value)) {
-                value.forEach(v => {
+                value.forEach((v) => {
                     process(key, v);
                 });
             }
-            else if (typeof value === 'object') {
+            else if (typeof value === "object") {
                 Object.entries(value).forEach(([k, v]) => {
                     process(`${key}[${k}]`, v);
                 });
@@ -61,14 +61,14 @@ export const getQueryString = (params) => {
         process(key, value);
     });
     if (qs.length > 0) {
-        return `?${qs.join('&')}`;
+        return `?${qs.join("&")}`;
     }
-    return '';
+    return "";
 };
 const getUrl = (config, options) => {
     const encoder = config.ENCODE_PATH || encodeURI;
     const path = options.url
-        .replace('{api-version}', config.VERSION)
+        .replace("{api-version}", config.VERSION)
         .replace(/{(.*?)}/g, (substring, group) => {
         var _a;
         if ((_a = options.path) === null || _a === void 0 ? void 0 : _a.hasOwnProperty(group)) {
@@ -97,7 +97,7 @@ export const getFormData = (options) => {
             .filter(([_, value]) => isDefined(value))
             .forEach(([key, value]) => {
             if (Array.isArray(value)) {
-                value.forEach(v => process(key, v));
+                value.forEach((v) => process(key, v));
             }
             else {
                 process(key, value);
@@ -108,7 +108,7 @@ export const getFormData = (options) => {
     return undefined;
 };
 export const resolve = async (options, resolver) => {
-    if (typeof resolver === 'function') {
+    if (typeof resolver === "function") {
         return resolver(options);
     }
     return resolver;
@@ -120,28 +120,30 @@ export const getHeaders = async (config, options) => {
         resolve(options, config.PASSWORD),
         resolve(options, config.HEADERS),
     ]);
-    const headers = Object.entries(Object.assign(Object.assign({ Accept: 'application/json' }, additionalHeaders), options.headers))
+    // Filter out undefined/null values from options.headers first
+    const optionsHeaders = Object.fromEntries(Object.entries(options.headers || {}).filter(([_, value]) => isDefined(value)));
+    const headers = Object.entries(Object.assign(Object.assign({ Accept: "application/json" }, optionsHeaders), additionalHeaders))
         .filter(([_, value]) => isDefined(value))
         .reduce((headers, [key, value]) => (Object.assign(Object.assign({}, headers), { [key]: String(value) })), {});
     if (isStringWithValue(token)) {
-        headers['Authorization'] = `Bearer ${token}`;
+        headers["Authorization"] = `Bearer ${token}`;
     }
     if (isStringWithValue(username) && isStringWithValue(password)) {
         const credentials = base64(`${username}:${password}`);
-        headers['Authorization'] = `Basic ${credentials}`;
+        headers["Authorization"] = `Basic ${credentials}`;
     }
     if (options.body !== undefined) {
         if (options.mediaType) {
-            headers['Content-Type'] = options.mediaType;
+            headers["Content-Type"] = options.mediaType;
         }
         else if (isBlob(options.body)) {
-            headers['Content-Type'] = options.body.type || 'application/octet-stream';
+            headers["Content-Type"] = options.body.type || "application/octet-stream";
         }
         else if (isString(options.body)) {
-            headers['Content-Type'] = 'text/plain';
+            headers["Content-Type"] = "text/plain";
         }
         else if (!isFormData(options.body)) {
-            headers['Content-Type'] = 'application/json';
+            headers["Content-Type"] = "application/json";
         }
     }
     return new Headers(headers);
@@ -149,10 +151,12 @@ export const getHeaders = async (config, options) => {
 export const getRequestBody = (options) => {
     var _a;
     if (options.body !== undefined) {
-        if ((_a = options.mediaType) === null || _a === void 0 ? void 0 : _a.includes('/json')) {
+        if ((_a = options.mediaType) === null || _a === void 0 ? void 0 : _a.includes("/json")) {
             return JSON.stringify(options.body);
         }
-        else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
+        else if (isString(options.body) ||
+            isBlob(options.body) ||
+            isFormData(options.body)) {
             return options.body;
         }
         else {
@@ -187,10 +191,10 @@ export const getResponseHeader = (response, responseHeader) => {
 export const getResponseBody = async (response) => {
     if (response.status !== 204) {
         try {
-            const contentType = response.headers.get('Content-Type');
+            const contentType = response.headers.get("Content-Type");
             if (contentType) {
-                const jsonTypes = ['application/json', 'application/problem+json'];
-                const isJSON = jsonTypes.some(type => contentType.toLowerCase().startsWith(type));
+                const jsonTypes = ["application/json", "application/problem+json"];
+                const isJSON = jsonTypes.some((type) => contentType.toLowerCase().startsWith(type));
                 if (isJSON) {
                     return await response.json();
                 }
@@ -207,14 +211,14 @@ export const getResponseBody = async (response) => {
 };
 export const catchErrorCodes = (options, result) => {
     var _a, _b;
-    const errors = Object.assign({ 400: 'Bad Request', 401: 'Unauthorized', 403: 'Forbidden', 404: 'Not Found', 500: 'Internal Server Error', 502: 'Bad Gateway', 503: 'Service Unavailable' }, options.errors);
+    const errors = Object.assign({ 400: "Bad Request", 401: "Unauthorized", 403: "Forbidden", 404: "Not Found", 500: "Internal Server Error", 502: "Bad Gateway", 503: "Service Unavailable" }, options.errors);
     const error = errors[result.status];
     if (error) {
         throw new ApiError(options, result, error);
     }
     if (!result.ok) {
-        const errorStatus = (_a = result.status) !== null && _a !== void 0 ? _a : 'unknown';
-        const errorStatusText = (_b = result.statusText) !== null && _b !== void 0 ? _b : 'unknown';
+        const errorStatus = (_a = result.status) !== null && _a !== void 0 ? _a : "unknown";
+        const errorStatusText = (_b = result.statusText) !== null && _b !== void 0 ? _b : "unknown";
         const errorBody = (() => {
             try {
                 return JSON.stringify(result.body, null, 2);
@@ -226,12 +230,10 @@ export const catchErrorCodes = (options, result) => {
         throw new ApiError(options, result, `Generic Error: status: ${errorStatus}; status text: ${errorStatusText}; body: ${errorBody}`);
     }
 };
+let globalCookieHeader;
 /**
- * Request method
- * @param config The OpenAPI configuration object
- * @param options The request options from the service
- * @returns CancelablePromise<T>
- * @throws ApiError
+ * Wraps sendRequest to capture cookies on login
+ * and attach cookies on other requests
  */
 export const request = (config, options) => {
     return new CancelablePromise(async (resolve, reject, onCancel) => {
@@ -239,9 +241,26 @@ export const request = (config, options) => {
             const url = getUrl(config, options);
             const formData = getFormData(options);
             const body = getRequestBody(options);
-            const headers = await getHeaders(config, options);
+            // Before making headers, possibly attach cookie if we have it
+            const baseHeaders = await getHeaders(config, options);
+            // We will build combined headers
+            const headerObj = {};
+            baseHeaders.forEach((value, key) => {
+                headerObj[key] = value;
+            });
+            if (globalCookieHeader) {
+                // Attach stored cookie
+                headerObj["Cookie"] = globalCookieHeader;
+            }
+            const headers = new Headers(headerObj);
             if (!onCancel.isCancelled) {
                 const response = await sendRequest(config, options, url, body, formData, headers, onCancel);
+                // Capture Set-Cookie if present
+                const setCookie = response.headers.get("set-cookie");
+                if (setCookie) {
+                    // Overwrite or append as needed
+                    globalCookieHeader = setCookie;
+                }
                 const responseBody = await getResponseBody(response);
                 const responseHeader = getResponseHeader(response, options.responseHeader);
                 const result = {

package/dist/esm/src/generated/shopper/core/request.js

@@ -120,7 +120,9 @@ export const getHeaders = async (config, options) => {
         resolve(options, config.PASSWORD),
         resolve(options, config.HEADERS),
     ]);
-    const headers = Object.entries(Object.assign(Object.assign({ Accept: "application/json" }, additionalHeaders), options.headers))
+    // Filter out undefined/null values from options.headers first
+    const optionsHeaders = Object.fromEntries(Object.entries(options.headers || {}).filter(([_, value]) => isDefined(value)));
+    const headers = Object.entries(Object.assign(Object.assign({ Accept: "application/json" }, optionsHeaders), additionalHeaders))
         .filter(([_, value]) => isDefined(value))
         .reduce((headers, [key, value]) => (Object.assign(Object.assign({}, headers), { [key]: String(value) })), {});
     if (isStringWithValue(token)) {

package/dist/esm/src/scripts/build-all.js

@@ -46,15 +46,18 @@ for (const spec of specs) {
         shell: true,
     });
 }
-// After generating all clients and definitions, replace request.ts for shopper and portal only
+// After generating all clients and definitions, replace request.ts for all services
 const customRequestPath = path.resolve('src/custom/custom-request.txt');
 const shopperRequestPath = path.resolve('src/generated/shopper/core/request.ts');
 const portalRequestPath = path.resolve('src/generated/portal/core/request.ts');
+const scannerRequestPath = path.resolve('src/generated/scanner/core/request.ts');
 const customRequestContent = fs.readFileSync(customRequestPath, 'utf-8');
 fs.writeFileSync(shopperRequestPath, customRequestContent);
 console.log('✅ Replaced shopper/core/request.ts with custom-request.txt');
 fs.writeFileSync(portalRequestPath, customRequestContent);
 console.log('✅ Replaced portal/core/request.ts with custom-request.txt');
+fs.writeFileSync(scannerRequestPath, customRequestContent);
+console.log('✅ Replaced scanner/core/request.ts with custom-request.txt');
 // --- Generate index.ts
 console.log(`🧩 Generating DRT index...`);
 const lines = [];
@@ -65,6 +68,7 @@ for (const spec of specs) {
     lines.push(`import { ${name} } from "./src/definitions/${name}.js";`);
 }
 lines.push(`import { setBaseUrlsOnce } from "./src/functions/setBaseURL.js";`);
+lines.push(`import { init, isReady, getConfig, reset } from "./src/functions/sdkConfig.js";`);
 lines.push('');
 // Re-export type namespaces for easy access
 for (const spec of specs) {
@@ -77,6 +81,10 @@ lines.push('export const DRT = {');
 for (const spec of specs) {
     lines.push(`  ${spec.name.toLowerCase()},`);
 }
+lines.push('  init,');
+lines.push('  isReady,');
+lines.push('  getConfig,');
+lines.push('  reset,');
 lines.push('};');
 lines.push('');
 lines.push('setBaseUrlsOnce();');

package/drt-api-specs.json

@@ -1,14 +1,14 @@
-[
-	{
-		"name": "shopper",
-		"url": "https://api.drttix.com/shopper/docs-json"
-	},
-	{
-		"name": "scanner",
-		"url": "https://api.drttix.com/scanner-v3/docs-json"
-	},
-    {
-        "name": "portal",
-        "url": "https://api.staging.drttix.com/admin-portal/docs-json"
-    }
-]
+[
+	{
+		"name": "shopper",
+		"url": "https://api.drttix.com/shopper/docs-json"
+	},
+	{
+		"name": "scanner",
+		"url": "https://api.drttix.com/scanner-v3/docs-json"
+	},
+    {
+        "name": "portal",
+        "url": "https://api.staging.drttix.com/admin-portal/docs-json"
+    }
+]

package/index.ts

@@ -4,6 +4,7 @@ import { shopper } from "./src/definitions/shopper";
 import { scanner } from "./src/definitions/scanner";
 import { portal } from "./src/definitions/portal";
 import { setBaseUrlsOnce } from "./src/functions/setBaseURL";
+import { init, isReady, getConfig, reset } from "./src/functions/sdkConfig";
 
 export { ShopperTypes } from "./src/definitions/shopper";
 export { ScannerTypes } from "./src/definitions/scanner";
@@ -13,6 +14,10 @@ export const DRT = {
   shopper,
   scanner,
   portal,
+  init,
+  isReady,
+  getConfig,
+  reset,
 };
 
 setBaseUrlsOnce();

package/package.json

@@ -1,30 +1,32 @@
-{
-    "name": "@drttix/drt-sdk",
-    "description": "DRT SDK",
-    "version": "0.6.4",
-    "main": "dist/cjs/index.js",
-    "module": "dist/esm/index.js",
-    "types": "dist/esm/index.d.ts",
-    "exports": {
-        "import": "./dist/esm/index.js",
-        "require": "./dist/cjs/index.js"
-    },
-    "type": "commonjs",
-    "private": false,
-    "publishConfig": {
-        "access": "public",
-        "registry": "https://registry.npmjs.org/"
-    },
-    "scripts": {
-        "build": "npx tsc --project tsconfig.esm.json && npx tsc --project tsconfig.cjs.json && node scripts/fix-import-extensions.mjs",
-        "generate": "npx tsx src/scripts/build-all.ts",
-        "prepublishOnly": "npx tsx src/scripts/check-version-not-published.ts && npm run build"
-    },
-    "devDependencies": {
-        "@types/node": "^24.0.4",
-        "typescript": "^5.8.3"
-    },
-    "dependencies": {
-        "@drttix/drt-sdk": "^0.2.9"
-    }
-}
+{
+    "name": "@drttix/drt-sdk",
+    "description": "DRT SDK",
+    "version": "0.6.15",
+    "main": "dist/cjs/index.js",
+    "module": "dist/esm/index.js",
+    "types": "dist/esm/index.d.ts",
+    "exports": {
+        "import": "./dist/esm/index.js",
+        "require": "./dist/cjs/index.js"
+    },
+    "type": "commonjs",
+    "private": false,
+    "publishConfig": {
+        "access": "public",
+        "registry": "https://registry.npmjs.org/"
+    },
+    "scripts": {
+        "build": "npx tsc --project tsconfig.esm.json && npx tsc --project tsconfig.cjs.json && node scripts/fix-import-extensions.mjs",
+        "build:bundle": "npm run build && npx esbuild dist/esm/index.js --bundle --format=esm --outfile=dist/bundle/drt-sdk.js --minify",
+        "generate": "npx tsx src/scripts/build-all.ts",
+        "prepublishOnly": "npx tsx src/scripts/check-version-not-published.ts && npm run build"
+    },
+    "devDependencies": {
+        "@types/node": "^24.0.4",
+        "esbuild": "^0.20.0",
+        "typescript": "^5.8.3"
+    },
+    "dependencies": {
+        "@drttix/drt-sdk": "^0.2.9"
+    }
+}

package/scripts/fix-import-extensions.mjs

@@ -1,88 +1,88 @@
-#!/usr/bin/env node
-import fs from 'fs/promises';
-import path from 'path';
-
-const root = path.resolve(process.cwd(), 'dist/esm/src');
-
-const EXT_WHITELIST = [
-    '.js',
-    '.mjs',
-    '.cjs',
-    '.json',
-    '.css',
-    '.scss',
-    '.d.ts',
-];
-
-function hasExt(p) {
-    return EXT_WHITELIST.some((ext) => p.endsWith(ext));
-}
-
-async function isDirectory(p) {
-    try {
-        const stat = await fs.stat(p);
-        return stat.isDirectory();
-    } catch {
-        return false;
-    }
-}
-
-async function walk(dir) {
-    const entries = await fs.readdir(dir, { withFileTypes: true });
-    for (const e of entries) {
-        const p = path.join(dir, e.name);
-        if (e.isDirectory()) await walk(p);
-        else if (e.isFile() && p.endsWith('.js')) await fixFile(p);
-    }
-}
-
-async function fixFile(file) {
-    let src = await fs.readFile(file, 'utf8');
-    const regex = /(["'])(\.\.?\/[^"']*?)(["'])/g;
-    let changed = false;
-    const matches = [...src.matchAll(regex)];
-
-    for (const match of matches) {
-        const [full, q1, spec, q3] = match;
-        // ignore absolute URLs and imports that already have extensions
-        if (/^https?:\/\//.test(spec) || /^\//.test(spec)) continue;
-        if (hasExt(spec)) continue;
-
-        // Resolve the path relative to the file's directory
-        const fileDir = path.dirname(file);
-        const resolvedPath = path.resolve(fileDir, spec);
-
-        let newSpec;
-        if (await isDirectory(resolvedPath)) {
-            // It's a directory, append /index.js
-            newSpec = `${spec}/index.js`;
-        } else {
-            // It's a file, append .js
-            newSpec = `${spec}.js`;
-        }
-
-        src = src.replace(full, `${q1}${newSpec}${q3}`);
-        changed = true;
-    }
-
-    if (changed) {
-        await fs.writeFile(file, src, 'utf8');
-        console.log('Patched', path.relative(process.cwd(), file));
-    }
-}
-
-async function main() {
-    try {
-        // Also fix the root index.js
-        const rootIndex = path.resolve(process.cwd(), 'dist/esm/index.js');
-        await fixFile(rootIndex);
-
-        await walk(root);
-        console.log('Done.');
-    } catch (err) {
-        console.error(err);
-        process.exit(1);
-    }
-}
-
-main();
+#!/usr/bin/env node
+import fs from 'fs/promises';
+import path from 'path';
+
+const root = path.resolve(process.cwd(), 'dist/esm/src');
+
+const EXT_WHITELIST = [
+    '.js',
+    '.mjs',
+    '.cjs',
+    '.json',
+    '.css',
+    '.scss',
+    '.d.ts',
+];
+
+function hasExt(p) {
+    return EXT_WHITELIST.some((ext) => p.endsWith(ext));
+}
+
+async function isDirectory(p) {
+    try {
+        const stat = await fs.stat(p);
+        return stat.isDirectory();
+    } catch {
+        return false;
+    }
+}
+
+async function walk(dir) {
+    const entries = await fs.readdir(dir, { withFileTypes: true });
+    for (const e of entries) {
+        const p = path.join(dir, e.name);
+        if (e.isDirectory()) await walk(p);
+        else if (e.isFile() && p.endsWith('.js')) await fixFile(p);
+    }
+}
+
+async function fixFile(file) {
+    let src = await fs.readFile(file, 'utf8');
+    const regex = /(["'])(\.\.?\/[^"']*?)(["'])/g;
+    let changed = false;
+    const matches = [...src.matchAll(regex)];
+
+    for (const match of matches) {
+        const [full, q1, spec, q3] = match;
+        // ignore absolute URLs and imports that already have extensions
+        if (/^https?:\/\//.test(spec) || /^\//.test(spec)) continue;
+        if (hasExt(spec)) continue;
+
+        // Resolve the path relative to the file's directory
+        const fileDir = path.dirname(file);
+        const resolvedPath = path.resolve(fileDir, spec);
+
+        let newSpec;
+        if (await isDirectory(resolvedPath)) {
+            // It's a directory, append /index.js
+            newSpec = `${spec}/index.js`;
+        } else {
+            // It's a file, append .js
+            newSpec = `${spec}.js`;
+        }
+
+        src = src.replace(full, `${q1}${newSpec}${q3}`);
+        changed = true;
+    }
+
+    if (changed) {
+        await fs.writeFile(file, src, 'utf8');
+        console.log('Patched', path.relative(process.cwd(), file));
+    }
+}
+
+async function main() {
+    try {
+        // Also fix the root index.js
+        const rootIndex = path.resolve(process.cwd(), 'dist/esm/index.js');
+        await fixFile(rootIndex);
+
+        await walk(root);
+        console.log('Done.');
+    } catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+}
+
+main();