@zodic/shared 0.0.1 → 0.0.3

package/middleware/index.ts

@@ -1,8 +1,8 @@
-import { getCookie } from "hono/cookie";
-import { Ctx } from "../types";
-import { verifyToken } from "../utils";
+import { getCookie } from 'hono/cookie';
+import { AuthCtx } from '../types';
+import { verifyToken } from '../utils';
 
-export const jwtMiddleware = async (c: Ctx, next: () => Promise<void>) => {
+export const jwtMiddleware = async (c: AuthCtx, next: () => Promise<void>) => {
   let token: string | undefined = undefined;
 
   // Check for the Authorization header
@@ -29,4 +29,4 @@ export const jwtMiddleware = async (c: Ctx, next: () => Promise<void>) => {
     console.error(err.message);
     return c.json({ error: 'Unauthorized: Invalid or expired token' }, 401);
   }
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodic/shared",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {

package/types/backend.ts

@@ -0,0 +1,3 @@
+export * from './scopes/cloudflare';
+export * from './scopes/db';
+export * from './scopes/generic';

package/types/frontend.ts

@@ -0,0 +1,2 @@
+export * from './scopes/db';
+export * from './scopes/generic';

package/types/index.ts

@@ -1,197 +1,2 @@
-import {
-  Ai,
-  D1Database,
-  KVNamespace,
-  R2Bucket,
-} from '@cloudflare/workers-types';
-import { Context, Env } from 'hono';
-export * from './db';
-
-export type CentralBindings = {
-  TEST_IMAGES_BUCKET: R2Bucket;
-  PHOTOS_BUCKET: R2Bucket;
-  OPENAI_API_KEY: string;
-  LEONARDO_API_KEY: string;
-  DESCRIBER_API_KEY: string;
-  DESCRIBER_APP_ID: string;
-  AKOOL_API_KEY: string;
-  KV_GENERATION_MANAGEMENT: KVNamespace;
-  KV_USER_GENERATIONS: KVNamespace;
-  KV_ARCHETYPES: KVNamespace;
-  KV_LEONARDO_PROMPTS: KVNamespace;
-  KV_TEST: KVNamespace;
-  PROMPT_IMAGE_DESCRIBER: string;
-  PROMPT_GENERATE_ARCHETYPE: string;
-  PROMPT_GENERATE_LEONARDO: string;
-  NEGATIVE_PROMPT_LEONARDO: string;
-  PROMPT_GENERATE_USER_LUMINOUS_SELF: string;
-  AI: Ai;
-  DB: D1Database;
-  JWT_SECRET: string;
-  CLOUDFLARE_DATABASE_ID: string;
-  CLOUDFLARE_D1_TOKEN: string;
-  CLOUDFLARE_ACCOUNT_ID: string;
-  ISSUER: string;
-  GOOGLE_API_KEY: string;
-  GOOGLE_SERVER_URL: string;
-  GOOGLE_CLIENT_ID: string;
-  GOOGLE_CLIENT_SECRET: string;
-  FACEBOOK_SERVER_URL: string;
-  FACEBOOK_CLIENT_ID: string;
-  FACEBOOK_CLIENT_SECRET: string;
-  OAUTH_REDIRECT_URI: string;
-  ASTROLOGY_API_USER: string;
-  ASTROLOGY_API_KEY: string;
-
-  API_BASE_URL: string;
-  PUBLIC_GOOGLE_CLIENT_ID: string;
-  PUBLIC_FACEBOOK_CLIENT_ID: string;
-  PUBLIC_APP_NAME: string;
-  PUBLIC_APP_VERSION: string;
-  PUBLIC_ANALYTICS_ID?: string;
-};
-
-export type Variables = {
-  jwtPayload: {
-    userId: string;
-    email?: string;
-    roles?: string[];
-  };
-};
-
-export type BackendBindings = Env &
-  Pick<
-    CentralBindings,
-    | 'TEST_IMAGES_BUCKET'
-    | 'PHOTOS_BUCKET'
-    | 'OPENAI_API_KEY'
-    | 'LEONARDO_API_KEY'
-    | 'DESCRIBER_API_KEY'
-    | 'DESCRIBER_APP_ID'
-    | 'AKOOL_API_KEY'
-    | 'KV_GENERATION_MANAGEMENT'
-    | 'KV_USER_GENERATIONS'
-    | 'KV_ARCHETYPES'
-    | 'KV_LEONARDO_PROMPTS'
-    | 'PROMPT_IMAGE_DESCRIBER'
-    | 'PROMPT_GENERATE_ARCHETYPE'
-    | 'PROMPT_GENERATE_LEONARDO'
-    | 'NEGATIVE_PROMPT_LEONARDO'
-    | 'PROMPT_GENERATE_USER_LUMINOUS_SELF'
-    | 'DB'
-    | 'JWT_SECRET'
-    | 'GOOGLE_API_KEY'
-    | 'GOOGLE_SERVER_URL'
-    | 'GOOGLE_CLIENT_ID'
-    | 'GOOGLE_CLIENT_SECRET'
-    | 'FACEBOOK_SERVER_URL'
-    | 'FACEBOOK_CLIENT_ID'
-    | 'FACEBOOK_CLIENT_SECRET'
-    | 'OAUTH_REDIRECT_URI'
-    | 'ASTROLOGY_API_USER'
-    | 'ASTROLOGY_API_KEY'
-    | 'AI'
-  >;
-
-export type BackendCtx = Context<
-  {
-    Bindings: BackendBindings;
-    Variables: Variables;
-  },
-  any,
-  {}
->;
-
-export type FrontendBindings = Pick<
-  CentralBindings,
-  | 'API_BASE_URL'
-  | 'PUBLIC_GOOGLE_CLIENT_ID'
-  | 'PUBLIC_FACEBOOK_CLIENT_ID'
-  | 'PUBLIC_APP_NAME'
-  | 'PUBLIC_APP_VERSION'
-  | 'PUBLIC_ANALYTICS_ID'
->;
-
-export type FrontCtx = {
-  bindings: FrontendBindings;
-};
-
-export type AuthBindings = Env &
-  Pick<
-    CentralBindings,
-    | 'JWT_SECRET'
-    | 'GOOGLE_CLIENT_ID'
-    | 'GOOGLE_CLIENT_SECRET'
-    | 'GOOGLE_SERVER_URL'
-    | 'FACEBOOK_CLIENT_ID'
-    | 'FACEBOOK_CLIENT_SECRET'
-    | 'FACEBOOK_SERVER_URL'
-    | 'OAUTH_REDIRECT_URI'
-    | 'ISSUER'
-  >;
-
-export type AuthCtx = {
-  bindings: AuthBindings;
-  variables: Variables;
-};
-
-export type Bindings = Env & {
-  TEST_IMAGES_BUCKET: R2Bucket;
-  PHOTOS_BUCKET: R2Bucket;
-  OPENAI_API_KEY: string;
-  LEONARDO_API_KEY: string;
-  DESCRIBER_API_KEY: string;
-  DESCRIBER_APP_ID: string;
-  AKOOL_API_KEY: string;
-  KV_GENERATION_MANAGEMENT: KVNamespace;
-  KV_USER_GENERATIONS: KVNamespace;
-  KV_ARCHETYPES: KVNamespace;
-  KV_LEONARDO_PROMPTS: KVNamespace;
-  KV_TEST: KVNamespace;
-  PROMPT_IMAGE_DESCRIBER: string;
-  PROMPT_GENERATE_ARCHETYPE: string;
-  PROMPT_GENERATE_LEONARDO: string;
-  NEGATIVE_PROMPT_LEONARDO: string;
-  PROMPT_GENERATE_USER_LUMINOUS_SELF: string;
-  AI: Ai;
-  DB: D1Database;
-  JWT_SECRET: string;
-  CLOUDFLARE_DATABASE_ID: string;
-  CLOUDFLARE_D1_TOKEN: string;
-  CLOUDFLARE_ACCOUNT_ID: string;
-  ISSUER: string;
-  GOOGLE_API_KEY: string;
-  GOOGLE_SERVER_URL: string;
-  GOOGLE_CLIENT_ID: string;
-  GOOGLE_CLIENT_SECRET: string;
-  FACEBOOK_SERVER_URL: string;
-  FACEBOOK_CLIENT_ID: string;
-  FACEBOOK_CLIENT_SECRET: string;
-  OAUTH_REDIRECT_URI: string;
-  ASTROLOGY_API_USER: string;
-  ASTROLOGY_API_KEY: string;
-};
-
-export type Ctx = Context<
-  {
-    Bindings: Bindings;
-    Variables: Variables;
-  },
-  any,
-  {}
->;
-
-export type Provider = 'google' | 'facebook';
-
-export type ProviderInfo = {
-  serverUrl: string;
-  clientId: string;
-  clientSecret: string;
-  resourceUrl: string;
-};
-
-export const VALID_GENDERS_ARRAY = ['male', 'female', 'non-binary'] as const;
-
-export type Gender = (typeof VALID_GENDERS_ARRAY)[number];
-
-export const VALID_GENDERS = new Set<Gender>(VALID_GENDERS_ARRAY);
+export * from './backend';
+export * from './frontend';

package/types/scopes/cloudflare.ts

@@ -0,0 +1,192 @@
+import {
+  Ai,
+  D1Database,
+  KVNamespace,
+  R2Bucket,
+} from '@cloudflare/workers-types';
+import { Context, Env } from 'hono';
+
+export type CentralBindings = {
+  TEST_IMAGES_BUCKET: R2Bucket;
+  PHOTOS_BUCKET: R2Bucket;
+  OPENAI_API_KEY: string;
+  LEONARDO_API_KEY: string;
+  DESCRIBER_API_KEY: string;
+  DESCRIBER_APP_ID: string;
+  AKOOL_API_KEY: string;
+  KV_GENERATION_MANAGEMENT: KVNamespace;
+  KV_USER_GENERATIONS: KVNamespace;
+  KV_ARCHETYPES: KVNamespace;
+  KV_LEONARDO_PROMPTS: KVNamespace;
+  KV_TEST: KVNamespace;
+  PROMPT_IMAGE_DESCRIBER: string;
+  PROMPT_GENERATE_ARCHETYPE: string;
+  PROMPT_GENERATE_LEONARDO: string;
+  NEGATIVE_PROMPT_LEONARDO: string;
+  PROMPT_GENERATE_USER_LUMINOUS_SELF: string;
+  AI: Ai;
+  DB: D1Database;
+  JWT_SECRET: string;
+  CLOUDFLARE_DATABASE_ID: string;
+  CLOUDFLARE_D1_TOKEN: string;
+  CLOUDFLARE_ACCOUNT_ID: string;
+  ISSUER: string;
+  GOOGLE_API_KEY: string;
+  GOOGLE_SERVER_URL: string;
+  GOOGLE_CLIENT_ID: string;
+  GOOGLE_CLIENT_SECRET: string;
+  FACEBOOK_SERVER_URL: string;
+  FACEBOOK_CLIENT_ID: string;
+  FACEBOOK_CLIENT_SECRET: string;
+  OAUTH_REDIRECT_URI: string;
+  ASTROLOGY_API_USER: string;
+  ASTROLOGY_API_KEY: string;
+
+  API_BASE_URL: string;
+  PUBLIC_GOOGLE_CLIENT_ID: string;
+  PUBLIC_FACEBOOK_CLIENT_ID: string;
+  PUBLIC_APP_NAME: string;
+  PUBLIC_APP_VERSION: string;
+  PUBLIC_ANALYTICS_ID?: string;
+};
+
+export type Variables = {
+  jwtPayload: {
+    userId: string;
+    email?: string;
+    roles?: string[];
+  };
+};
+
+export type BackendBindings = Env &
+  Pick<
+    CentralBindings,
+    | 'TEST_IMAGES_BUCKET'
+    | 'PHOTOS_BUCKET'
+    | 'OPENAI_API_KEY'
+    | 'LEONARDO_API_KEY'
+    | 'DESCRIBER_API_KEY'
+    | 'DESCRIBER_APP_ID'
+    | 'AKOOL_API_KEY'
+    | 'KV_GENERATION_MANAGEMENT'
+    | 'KV_USER_GENERATIONS'
+    | 'KV_ARCHETYPES'
+    | 'KV_LEONARDO_PROMPTS'
+    | 'PROMPT_IMAGE_DESCRIBER'
+    | 'PROMPT_GENERATE_ARCHETYPE'
+    | 'PROMPT_GENERATE_LEONARDO'
+    | 'NEGATIVE_PROMPT_LEONARDO'
+    | 'PROMPT_GENERATE_USER_LUMINOUS_SELF'
+    | 'DB'
+    | 'JWT_SECRET'
+    | 'GOOGLE_API_KEY'
+    | 'GOOGLE_SERVER_URL'
+    | 'GOOGLE_CLIENT_ID'
+    | 'GOOGLE_CLIENT_SECRET'
+    | 'FACEBOOK_SERVER_URL'
+    | 'FACEBOOK_CLIENT_ID'
+    | 'FACEBOOK_CLIENT_SECRET'
+    | 'OAUTH_REDIRECT_URI'
+    | 'ASTROLOGY_API_USER'
+    | 'ASTROLOGY_API_KEY'
+    | 'AI'
+  >;
+
+export type BackendCtx = Context<
+  {
+    Bindings: BackendBindings;
+    Variables: Variables;
+  },
+  any,
+  {}
+>;
+
+export type FrontendBindings = Pick<
+  CentralBindings,
+  | 'API_BASE_URL'
+  | 'PUBLIC_GOOGLE_CLIENT_ID'
+  | 'PUBLIC_FACEBOOK_CLIENT_ID'
+  | 'PUBLIC_APP_NAME'
+  | 'PUBLIC_APP_VERSION'
+  | 'PUBLIC_ANALYTICS_ID'
+>;
+
+export type FrontCtx = Context<
+  {
+    Bindings: FrontendBindings;
+    Variables: Variables;
+  },
+  any,
+  {}
+>;
+
+export type AuthBindings = Env &
+  Pick<
+    CentralBindings,
+    | 'JWT_SECRET'
+    | 'GOOGLE_CLIENT_ID'
+    | 'GOOGLE_CLIENT_SECRET'
+    | 'GOOGLE_SERVER_URL'
+    | 'FACEBOOK_CLIENT_ID'
+    | 'FACEBOOK_CLIENT_SECRET'
+    | 'FACEBOOK_SERVER_URL'
+    | 'OAUTH_REDIRECT_URI'
+    | 'ISSUER'
+    | 'DB'
+    | 'CLOUDFLARE_ACCOUNT_ID'
+  >;
+
+export type AuthCtx = Context<
+  {
+    Bindings: AuthBindings;
+    Variables: Variables;
+  },
+  any,
+  {}
+>;
+
+export type Bindings = Env & {
+  TEST_IMAGES_BUCKET: R2Bucket;
+  PHOTOS_BUCKET: R2Bucket;
+  OPENAI_API_KEY: string;
+  LEONARDO_API_KEY: string;
+  DESCRIBER_API_KEY: string;
+  DESCRIBER_APP_ID: string;
+  AKOOL_API_KEY: string;
+  KV_GENERATION_MANAGEMENT: KVNamespace;
+  KV_USER_GENERATIONS: KVNamespace;
+  KV_ARCHETYPES: KVNamespace;
+  KV_LEONARDO_PROMPTS: KVNamespace;
+  KV_TEST: KVNamespace;
+  PROMPT_IMAGE_DESCRIBER: string;
+  PROMPT_GENERATE_ARCHETYPE: string;
+  PROMPT_GENERATE_LEONARDO: string;
+  NEGATIVE_PROMPT_LEONARDO: string;
+  PROMPT_GENERATE_USER_LUMINOUS_SELF: string;
+  AI: Ai;
+  DB: D1Database;
+  JWT_SECRET: string;
+  CLOUDFLARE_DATABASE_ID: string;
+  CLOUDFLARE_D1_TOKEN: string;
+  CLOUDFLARE_ACCOUNT_ID: string;
+  ISSUER: string;
+  GOOGLE_API_KEY: string;
+  GOOGLE_SERVER_URL: string;
+  GOOGLE_CLIENT_ID: string;
+  GOOGLE_CLIENT_SECRET: string;
+  FACEBOOK_SERVER_URL: string;
+  FACEBOOK_CLIENT_ID: string;
+  FACEBOOK_CLIENT_SECRET: string;
+  OAUTH_REDIRECT_URI: string;
+  ASTROLOGY_API_USER: string;
+  ASTROLOGY_API_KEY: string;
+};
+
+export type Ctx = Context<
+  {
+    Bindings: Bindings;
+    Variables: Variables;
+  },
+  any,
+  {}
+>;

package/types/{db.ts → scopes/db.ts}

@@ -1,5 +1,11 @@
 import type { InferInsertModel, InferSelectModel, Table } from 'drizzle-orm';
-import { users, astrologicalData, generations, products, tokens } from '../db/schema';
+import {
+  astrologicalData,
+  generations,
+  products,
+  tokens,
+  users,
+} from '../../db/schema';
 
 type NullableSelect<T extends Table> = InferSelectModel<T> | undefined | null;
 

package/types/scopes/generic.ts

@@ -0,0 +1,14 @@
+export type Provider = 'google' | 'facebook';
+
+export type ProviderInfo = {
+  serverUrl: string;
+  clientId: string;
+  clientSecret: string;
+  resourceUrl: string;
+};
+
+export const VALID_GENDERS_ARRAY = ['male', 'female', 'non-binary'] as const;
+
+export type Gender = (typeof VALID_GENDERS_ARRAY)[number];
+
+export const VALID_GENDERS = new Set<Gender>(VALID_GENDERS_ARRAY);

package/utils/index.ts

@@ -1,8 +1,8 @@
 import { jwtVerify } from 'jose';
-import { Ctx, Provider, ProviderInfo } from '../types';
+import { AuthCtx, Provider, ProviderInfo } from '../types';
 
 export const verifyToken = async (
-  c: Ctx,
+  c: AuthCtx,
   token: string
 ): Promise<{ userId: string; email?: string; roles?: string[] }> => {
   const jwtSecret = c.env.JWT_SECRET;
@@ -32,7 +32,9 @@ export const verifyToken = async (
   }
 };
 
-export const providers: (c: Ctx) => Record<Provider, ProviderInfo> = (c) => ({
+export const providers: (c: AuthCtx) => Record<Provider, ProviderInfo> = (
+  c
+) => ({
   google: {
     serverUrl: c.env.GOOGLE_SERVER_URL,
     clientId: c.env.GOOGLE_CLIENT_ID,