@develit-io/backend-sdk 5.34.0 → 5.34.1

package/dist/index.d.mts

@@ -307,16 +307,14 @@ declare function createAuditLogWriter<TAuditAction = string>(table: AuditLogTabl
 
 declare function durableObjectNamespaceIdFromName(uniqueKey: string, name: string): string;
 declare const getD1DatabaseIdFromWrangler: () => string | undefined;
-declare const getD1Credentials: ({ instanceName, }: {
-    instanceName: string;
-}) => Promise<{
+declare const getD1Credentials: () => {
     driver?: undefined;
     dbCredentials?: undefined;
 } | {
     driver: string;
     dbCredentials: {
         accountId: string | undefined;
-        databaseId: string | undefined;
+        databaseId: string;
         token: string | undefined;
         url?: undefined;
     };
@@ -328,90 +326,32 @@ declare const getD1Credentials: ({ instanceName, }: {
         token?: undefined;
     };
     driver?: undefined;
-}>;
-declare const getDrizzleD1Config: ({ instanceName, }: {
-    instanceName: string;
-}) => {
-    then<TResult1 = {
-        driver?: undefined;
-        dbCredentials?: undefined;
-    } | {
-        driver: string;
-        dbCredentials: {
-            accountId: string | undefined;
-            databaseId: string | undefined;
-            token: string | undefined;
-            url?: undefined;
-        };
-    } | {
-        dbCredentials: {
-            url: string | undefined;
-            accountId?: undefined;
-            databaseId?: undefined;
-            token?: undefined;
-        };
-        driver?: undefined;
-    }, TResult2 = never>(onfulfilled?: ((value: {
-        driver?: undefined;
-        dbCredentials?: undefined;
-    } | {
-        driver: string;
-        dbCredentials: {
-            accountId: string | undefined;
-            databaseId: string | undefined;
-            token: string | undefined;
-            url?: undefined;
-        };
-    } | {
-        dbCredentials: {
-            url: string | undefined;
-            accountId?: undefined;
-            databaseId?: undefined;
-            token?: undefined;
-        };
-        driver?: undefined;
-    }) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined): Promise<TResult1 | TResult2>;
-    catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null | undefined): Promise<{
-        driver?: undefined;
-        dbCredentials?: undefined;
-    } | {
-        driver: string;
-        dbCredentials: {
-            accountId: string | undefined;
-            databaseId: string | undefined;
-            token: string | undefined;
-            url?: undefined;
-        };
-    } | {
-        dbCredentials: {
-            url: string | undefined;
-            accountId?: undefined;
-            databaseId?: undefined;
-            token?: undefined;
-        };
-        driver?: undefined;
-    } | TResult>;
-    finally(onfinally?: (() => void) | null | undefined): Promise<{
-        driver?: undefined;
-        dbCredentials?: undefined;
-    } | {
-        driver: string;
-        dbCredentials: {
-            accountId: string | undefined;
-            databaseId: string | undefined;
-            token: string | undefined;
-            url?: undefined;
-        };
-    } | {
-        dbCredentials: {
-            url: string | undefined;
-            accountId?: undefined;
-            databaseId?: undefined;
-            token?: undefined;
-        };
-        driver?: undefined;
-    }>;
-    [Symbol.toStringTag]: string;
+};
+declare const getDrizzleD1Config: () => {
+    driver?: undefined;
+    dbCredentials?: undefined;
+    schema: string;
+    out: string;
+    dialect: "sqlite";
+} | {
+    driver: string;
+    dbCredentials: {
+        accountId: string | undefined;
+        databaseId: string;
+        token: string | undefined;
+        url?: undefined;
+    };
+    schema: string;
+    out: string;
+    dialect: "sqlite";
+} | {
+    dbCredentials: {
+        url: string | undefined;
+        accountId?: undefined;
+        databaseId?: undefined;
+        token?: undefined;
+    };
+    driver?: undefined;
     schema: string;
     out: string;
     dialect: "sqlite";

package/dist/index.d.ts

@@ -307,16 +307,14 @@ declare function createAuditLogWriter<TAuditAction = string>(table: AuditLogTabl
 
 declare function durableObjectNamespaceIdFromName(uniqueKey: string, name: string): string;
 declare const getD1DatabaseIdFromWrangler: () => string | undefined;
-declare const getD1Credentials: ({ instanceName, }: {
-    instanceName: string;
-}) => Promise<{
+declare const getD1Credentials: () => {
     driver?: undefined;
     dbCredentials?: undefined;
 } | {
     driver: string;
     dbCredentials: {
         accountId: string | undefined;
-        databaseId: string | undefined;
+        databaseId: string;
         token: string | undefined;
         url?: undefined;
     };
@@ -328,90 +326,32 @@ declare const getD1Credentials: ({ instanceName, }: {
         token?: undefined;
     };
     driver?: undefined;
-}>;
-declare const getDrizzleD1Config: ({ instanceName, }: {
-    instanceName: string;
-}) => {
-    then<TResult1 = {
-        driver?: undefined;
-        dbCredentials?: undefined;
-    } | {
-        driver: string;
-        dbCredentials: {
-            accountId: string | undefined;
-            databaseId: string | undefined;
-            token: string | undefined;
-            url?: undefined;
-        };
-    } | {
-        dbCredentials: {
-            url: string | undefined;
-            accountId?: undefined;
-            databaseId?: undefined;
-            token?: undefined;
-        };
-        driver?: undefined;
-    }, TResult2 = never>(onfulfilled?: ((value: {
-        driver?: undefined;
-        dbCredentials?: undefined;
-    } | {
-        driver: string;
-        dbCredentials: {
-            accountId: string | undefined;
-            databaseId: string | undefined;
-            token: string | undefined;
-            url?: undefined;
-        };
-    } | {
-        dbCredentials: {
-            url: string | undefined;
-            accountId?: undefined;
-            databaseId?: undefined;
-            token?: undefined;
-        };
-        driver?: undefined;
-    }) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined): Promise<TResult1 | TResult2>;
-    catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null | undefined): Promise<{
-        driver?: undefined;
-        dbCredentials?: undefined;
-    } | {
-        driver: string;
-        dbCredentials: {
-            accountId: string | undefined;
-            databaseId: string | undefined;
-            token: string | undefined;
-            url?: undefined;
-        };
-    } | {
-        dbCredentials: {
-            url: string | undefined;
-            accountId?: undefined;
-            databaseId?: undefined;
-            token?: undefined;
-        };
-        driver?: undefined;
-    } | TResult>;
-    finally(onfinally?: (() => void) | null | undefined): Promise<{
-        driver?: undefined;
-        dbCredentials?: undefined;
-    } | {
-        driver: string;
-        dbCredentials: {
-            accountId: string | undefined;
-            databaseId: string | undefined;
-            token: string | undefined;
-            url?: undefined;
-        };
-    } | {
-        dbCredentials: {
-            url: string | undefined;
-            accountId?: undefined;
-            databaseId?: undefined;
-            token?: undefined;
-        };
-        driver?: undefined;
-    }>;
-    [Symbol.toStringTag]: string;
+};
+declare const getDrizzleD1Config: () => {
+    driver?: undefined;
+    dbCredentials?: undefined;
+    schema: string;
+    out: string;
+    dialect: "sqlite";
+} | {
+    driver: string;
+    dbCredentials: {
+        accountId: string | undefined;
+        databaseId: string;
+        token: string | undefined;
+        url?: undefined;
+    };
+    schema: string;
+    out: string;
+    dialect: "sqlite";
+} | {
+    dbCredentials: {
+        url: string | undefined;
+        accountId?: undefined;
+        databaseId?: undefined;
+        token?: undefined;
+    };
+    driver?: undefined;
     schema: string;
     out: string;
     dialect: "sqlite";

package/dist/index.mjs

@@ -6,7 +6,7 @@ import { z as z$1 } from 'zod';
 import * as z from 'zod/v4/core';
 import 'http-status-codes';
 import { createError } from 'h3';
-import Cloudflare from 'cloudflare';
+import 'cloudflare';
 import fs from 'node:fs';
 import crypto$1 from 'node:crypto';
 import path from 'node:path';
@@ -345,37 +345,6 @@ function durableObjectNamespaceIdFromName(uniqueKey, name) {
   const hmac = crypto$1.createHmac("sha256", key).update(nameHmac).digest().subarray(0, 16);
   return Buffer.concat([nameHmac, hmac]).toString("hex");
 }
-const getD1DatabaseId = async ({
-  instanceName,
-  environment
-}) => {
-  const remoteD1s = [];
-  const cloudflare = new Cloudflare({
-    apiToken: process.env.CLOUDFLARE_API_TOKEN
-  });
-  let currentPage = await cloudflare.d1.database.list({
-    account_id: process.env.CLOUDFLARE_ACCOUNT_ID
-  });
-  remoteD1s.push(...currentPage.getPaginatedItems());
-  while (currentPage.hasNextPage()) {
-    const pageInfo = currentPage.nextPageInfo();
-    let nextPageParams;
-    if ("params" in pageInfo) {
-      nextPageParams = pageInfo.params;
-    } else {
-      nextPageParams = Object.fromEntries(pageInfo.url.searchParams);
-    }
-    currentPage = await cloudflare.d1.database.list({
-      account_id: process.env.CLOUDFLARE_ACCOUNT_ID,
-      ...nextPageParams
-    });
-    remoteD1s.push(...currentPage.getPaginatedItems());
-  }
-  const instancesByName = remoteD1s.filter(
-    (d1) => d1.name?.includes(instanceName)
-  );
-  return instancesByName.filter((name) => name.name?.includes(environment)).at(0)?.uuid;
-};
 const getD1DatabaseIdFromWrangler = () => {
   try {
     const wranglerPath = path.resolve("./wrangler.jsonc");
@@ -432,40 +401,34 @@ const getLocalD1 = (databaseId) => {
     }
   }
 };
-const getD1Credentials = async ({
-  instanceName
-}) => {
+const getD1Credentials = () => {
   const environment = process.env.ENVIRONMENT;
   if (environment === "localhost") {
     return {};
   }
+  const databaseId = getD1DatabaseIdFromWrangler() ?? "";
   if (isRemoteEnvironment()) {
     return {
       driver: "d1-http",
       dbCredentials: {
         accountId: process.env.CLOUDFLARE_ACCOUNT_ID,
-        databaseId: await getD1DatabaseId({
-          environment,
-          instanceName
-        }),
+        databaseId,
         token: process.env.CLOUDFLARE_API_TOKEN
       }
     };
   } else {
     return {
       dbCredentials: {
-        url: getLocalD1(getD1DatabaseIdFromWrangler() || "")
+        url: getLocalD1(databaseId)
       }
     };
   }
 };
-const getDrizzleD1Config = ({
-  instanceName
-}) => ({
+const getDrizzleD1Config = () => ({
   schema: "./src/database/schema/",
   out: "./src/database/migrations/",
   dialect: "sqlite",
-  ...getD1Credentials({ instanceName })
+  ...getD1Credentials()
 });
 
 class DatabaseTransaction {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@develit-io/backend-sdk",
-  "version": "5.34.0",
+  "version": "5.34.1",
   "description": "Develit Backend SDK",
   "author": "Develit.io",
   "license": "ISC",