silgi 0.12.4 → 0.14.0

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.12.4";
+const version = "0.14.0";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/cli/loader.mjs

@@ -27,6 +27,7 @@ const SilgiCLIDefaults = {
       version: "0.0.1"
     }
   },
+  storages: [],
   devServer: {
     watch: []
   },

package/dist/cli/writeTypesAndFiles.mjs

@@ -1387,7 +1387,6 @@ function useCLIRuntimeConfig(silgi) {
   const _sharedRuntimeConfig = initRuntimeConfig(silgi.options.envOptions, silgi.options.runtimeConfig);
   silgi.options.runtimeConfig = _sharedRuntimeConfig;
   silgi.hook("prepare:configs.ts", (data) => {
-    data.storage = silgi.options.storage;
     data.runtimeConfig = _sharedRuntimeConfig;
     silgi.options.envOptions = silgi.options.envOptions;
   });
@@ -1756,7 +1755,11 @@ async function prepareFramework(silgi) {
   const importItems = {
     "silgi/types": {
       import: [
-        { name: "SilgiRuntimeContext", type: true }
+        {
+          name: "SilgiRuntimeContext",
+          type: true,
+          key: "SilgiRuntimeContext"
+        }
       ],
       from: "silgi/types"
     }
@@ -1781,7 +1784,11 @@ async function createDTSFramework(silgi) {
   const importItems = {
     "silgi/types": {
       import: [
-        { name: "SilgiRuntimeContext", type: true }
+        {
+          name: "SilgiRuntimeContext",
+          type: true,
+          key: "SilgiRuntimeContext"
+        }
       ],
       from: "silgi/types"
     }
@@ -1996,11 +2003,14 @@ async function prepareSchema(silgi) {
     "",
     silgi.options.typescript.generateRuntimeConfigTypes ? generateTypes(
       await resolveSchema(
-        Object.fromEntries(
-          Object.entries(silgi.options.runtimeConfig).filter(
-            ([key]) => !["app", "nitro", "nuxt"].includes(key)
-          )
-        )
+        {
+          ...Object.fromEntries(
+            Object.entries(silgi.options.runtimeConfig).filter(
+              ([key]) => !["app", "nitro", "nuxt"].includes(key)
+            )
+          ),
+          ...silgi.options.storages
+        }
       ),
       {
         interfaceName: "SilgiRuntimeConfigExtends",

package/dist/core/index.mjs

@@ -5,7 +5,6 @@ import { getContext } from 'unctx';
 import { Buffer } from 'node:buffer';
 import { klona } from 'klona';
 import { createStorage as createStorage$1, builtinDrivers, prefixStorage } from 'unstorage';
-import memoryDriver from 'unstorage/drivers/memory';
 
 const silgiCtx = getContext("silgi");
 function useSilgi() {
@@ -423,7 +422,6 @@ async function createStorage(silgi) {
   for (const [path, opts] of Object.entries(mounts)) {
     if (opts.driver) {
       const driver = await import(builtinDrivers[opts.driver] || opts.driver).then((r) => r.default || r);
-      storage.mount("/memory:cache", memoryDriver());
       storage.mount(path, driver(opts));
     } else {
       silgi.logger.warn(`No \`driver\` set for storage mount point "${path}".`);

package/dist/kit/index.d.mts

@@ -2,6 +2,7 @@ import { SilgiCLI, ModuleOptionsCustom, ModuleDefinition, SilgiModule, SilgiPres
 import { Buffer } from 'node:buffer';
 import * as consola from 'consola';
 import { ConsolaOptions } from 'consola';
+import { IncomingMessage } from 'node:http';
 
 declare function hasError(type: SilgiCLI['errors'][0]['type'], silgi?: SilgiCLI): boolean;
 
@@ -93,6 +94,17 @@ declare function addTemplate<T>(_template: SilgiTemplate<T> | string): ResolvedS
  */
 declare function normalizeTemplate<T>(template: SilgiTemplate<T> | string, buildDir?: string): ResolvedSilgiTemplate<T>;
 
+declare function useRequest(event: SilgiEvents): false | (IncomingMessage & {
+    originalUrl?: string;
+});
+declare function getIpAddress(event: SilgiEvents): string | false;
+/**
+ * Extract the client's IP address from request headers with high accuracy
+ * @param req - The incoming HTTP request
+ * @returns The client's IP address or empty string if not found
+ */
+declare function ipAddress(req: IncomingMessage): string;
+
 declare function relativeWithDot(from: string, to: string): string;
 /** @since 3.9.0 */
 declare function toArray<T>(value: T | T[]): T[];
@@ -113,4 +125,4 @@ declare const MODE_RE: RegExp;
 declare function hasSilgiModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 
-export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, useSilgiRuntimeConfig, writeFile };
+export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, useRequest, useSilgiRuntimeConfig, writeFile };

package/dist/kit/index.d.ts

@@ -2,6 +2,7 @@ import { SilgiCLI, ModuleOptionsCustom, ModuleDefinition, SilgiModule, SilgiPres
 import { Buffer } from 'node:buffer';
 import * as consola from 'consola';
 import { ConsolaOptions } from 'consola';
+import { IncomingMessage } from 'node:http';
 
 declare function hasError(type: SilgiCLI['errors'][0]['type'], silgi?: SilgiCLI): boolean;
 
@@ -93,6 +94,17 @@ declare function addTemplate<T>(_template: SilgiTemplate<T> | string): ResolvedS
  */
 declare function normalizeTemplate<T>(template: SilgiTemplate<T> | string, buildDir?: string): ResolvedSilgiTemplate<T>;
 
+declare function useRequest(event: SilgiEvents): false | (IncomingMessage & {
+    originalUrl?: string;
+});
+declare function getIpAddress(event: SilgiEvents): string | false;
+/**
+ * Extract the client's IP address from request headers with high accuracy
+ * @param req - The incoming HTTP request
+ * @returns The client's IP address or empty string if not found
+ */
+declare function ipAddress(req: IncomingMessage): string;
+
 declare function relativeWithDot(from: string, to: string): string;
 /** @since 3.9.0 */
 declare function toArray<T>(value: T | T[]): T[];
@@ -113,4 +125,4 @@ declare const MODE_RE: RegExp;
 declare function hasSilgiModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 
-export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, useSilgiRuntimeConfig, writeFile };
+export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, useRequest, useSilgiRuntimeConfig, writeFile };

package/dist/kit/index.mjs

@@ -413,4 +413,85 @@ function normalizeTemplate(template, buildDir) {
   return template;
 }
 
-export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, useSilgiRuntimeConfig, writeFile };
+function useRequest(event) {
+  const silgi = useSilgi();
+  if (silgi.options.present === "nuxt" || silgi.options.present === "nitro" || silgi.options.present === "h3") {
+    return event.node.req;
+  }
+  return false;
+}
+function getIpAddress(event) {
+  const silgi = useSilgi();
+  if (silgi.options.present === "nuxt" || silgi.options.present === "nitro" || silgi.options.present === "h3") {
+    const _ipAddress = ipAddress(event.node.req);
+    return _ipAddress;
+  }
+  return false;
+}
+function ipAddress(req) {
+  const headers = [
+    "cf-connecting-ip",
+    // Cloudflare
+    "true-client-ip",
+    // Akamai and Cloudflare
+    "x-real-ip",
+    // Nginx proxy/FastCGI
+    "x-forwarded-for",
+    // Standard proxy header
+    "x-client-ip",
+    // Apache
+    "x-forwarded",
+    // Alternative format
+    "forwarded",
+    // RFC 7239 compliant format
+    "forwarded-for",
+    // RFC 7239 variant
+    "x-appengine-user-ip",
+    // Google App Engine
+    "x-cluster-client-ip",
+    // GCP load balancer
+    "fastly-client-ip",
+    // Fastly CDN
+    "x-azure-clientip",
+    // Azure
+    "x-original-forwarded-for",
+    // Secondary forwarded-for header
+    "x-lb-forwarded-for",
+    // Load balancer specific
+    "cdn-loop"
+    // Used by some CDNs
+  ];
+  for (const header of headers) {
+    const value = req.headers[header];
+    if (!value)
+      continue;
+    let ip;
+    if (Array.isArray(value)) {
+      ip = value[0];
+    } else if (header === "x-forwarded-for" || header === "forwarded-for" || header === "x-original-forwarded-for") {
+      ip = value.split(",")[0];
+    } else if (header === "forwarded") {
+      const match = value.match(/for=([^;]+)/);
+      ip = match ? match[1].trim().replace(/^\[|\]$/g, "") : "";
+    } else {
+      ip = value;
+    }
+    const cleanIp = ip.trim();
+    if (cleanIp && isValidIp(cleanIp)) {
+      return cleanIp;
+    }
+  }
+  const socketIp = req.socket.remoteAddress ?? "";
+  return socketIp && isValidIp(socketIp) ? socketIp : "";
+}
+function isValidIp(ip) {
+  if (ip === "::1" || ip === "localhost" || ip === "127.0.0.1")
+    return true;
+  if (/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(ip))
+    return true;
+  if (/^[0-9a-f:]+$/i.test(ip))
+    return true;
+  return false;
+}
+
+export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, filterInPlace, getIpAddress, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, toArray, tryResolveModule, useLogger, useRequest, useSilgiRuntimeConfig, writeFile };

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.12.4";
+const version = "0.14.0";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.12.4";
+const version = "0.14.0";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/presets/nitro/preset.mjs

@@ -11,7 +11,8 @@ const nitro = defineSilgiPreset(
     },
     envOptions: {
       prefix: "NITRO_"
-    }
+    },
+    storages: ["data", "/assets"]
   },
   {
     name: "nitro",

package/dist/presets/nuxt/preset.mjs

@@ -12,7 +12,8 @@ const nuxt = defineSilgiPreset(
     envOptions: {
       prefix: "NITRO_",
       altPrefix: "NUXT_"
-    }
+    },
+    storages: ["data", "/assets"]
   },
   {
     name: "nuxt",

package/dist/types/index.d.mts

@@ -569,6 +569,7 @@ interface SilgiCLIOptions extends PresetOptions {
     runtimeConfig: SilgiRuntimeConfig$1 & {
         [key: string]: any;
     };
+    storages: string[];
     namespaces: string[];
     hooks: NestedHooks<SilgiCLIHooks$1>;
     plugins: {
@@ -902,7 +903,7 @@ interface SilgiStorageBase {
 type StorageKeyGenerator<TInput> = (input: TInput) => string | Promise<string>;
 interface StorageConfig<TInput> {
     options: TransactionOptions;
-    base: '/memory:cache' | keyof SilgiStorageBase;
+    base: 'memory' | keyof SilgiStorageBase;
     key?: StorageKeyGenerator<TInput>;
     scope?: 'request' | 'global';
 }

package/dist/types/index.d.ts

@@ -569,6 +569,7 @@ interface SilgiCLIOptions extends PresetOptions {
     runtimeConfig: SilgiRuntimeConfig$1 & {
         [key: string]: any;
     };
+    storages: string[];
     namespaces: string[];
     hooks: NestedHooks<SilgiCLIHooks$1>;
     plugins: {
@@ -902,7 +903,7 @@ interface SilgiStorageBase {
 type StorageKeyGenerator<TInput> = (input: TInput) => string | Promise<string>;
 interface StorageConfig<TInput> {
     options: TransactionOptions;
-    base: '/memory:cache' | keyof SilgiStorageBase;
+    base: 'memory' | keyof SilgiStorageBase;
     key?: StorageKeyGenerator<TInput>;
     scope?: 'request' | 'global';
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.12.4",
+  "version": "0.14.0",
   "private": false,
   "sideEffects": false,
   "exports": {