@appconda/nextjs 1.0.26 → 1.0.27

package/dist/services/subscription.js

@@ -1,14 +1,4 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 import { ServiceClient } from "../service-client";
-import { Cache } from '../decorators/Cache';
 export class Subscription extends ServiceClient {
     getServiceName() {
         return 'com.appconda.service.subscription';
@@ -37,9 +27,3 @@ export class Subscription extends ServiceClient {
         return await this.actionCall('GetAllTenantSubscriptionProducts', payload);
     }
 }
-__decorate([
-    Cache(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", Promise)
-], Subscription.prototype, "getAllTenantSubscriptionProducts", null);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@appconda/nextjs",
   "homepage": "https://appconda.io/support",
   "description": "Appconda is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "license": "BSD-3-Clause",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,7 +11,6 @@
     "url": "https://github.com/appconda/sdk-for-console"
   },
   "scripts": {
-    "build": "npm run build:types && npm run build:libs",
     "tsc-build": "tsc"
   },
   "devDependencies": {

package/publish.sh

@@ -1,4 +1,4 @@
 
 npm version patch -m "Upgrade to new version"
-npm run build
+npm run tsc-build
 npm publish --access public

package/src/services/subscription.ts

@@ -1,6 +1,5 @@
 import { Payload } from "../client";
 import { ServiceClient } from "../service-client";
-import { Cache } from '../decorators/Cache'
 
 
 
@@ -30,7 +29,7 @@ export class Subscription extends ServiceClient {
         return await this.actionCall('GetSubscriptionProduct', payload);
     }
 
-    @Cache()
+    
     public async getAllTenantSubscriptionProducts(filters?: any, pagination?: { page: number; pageSize: number }): Promise<{ items: any[]; pagination: any }> {
         const payload: Payload = {};
         payload['filters'] = filters;

package/src/Cache/Adapter.ts

@@ -1,11 +0,0 @@
-
-export interface Adapter {
-    load(key: string, ttl: number, hash?: string): Promise<any>;
-    save(key: string, data: any, hash?: string): Promise<boolean | string | any[]>;
-    list(key: string): Promise<string[]>;
-    purge(key: string, hash?: string): Promise<boolean>;
-    flush(): Promise<boolean>;
-    ping(): Promise<boolean>;
-    getSize(): Promise<number>;
-     delWithStart(pattern: string): Promise<number>;
-}

package/src/Cache/Adapters/Filesystem.ts

@@ -1,126 +0,0 @@
-import { Adapter } from "../Adapter";
-const fs = require('fs');
-const path = require('path');
-const glob = require('glob');
-
-export class Filesystem implements Adapter {
-    protected path: string = '';
-
-    constructor(path: string) {
-        this.path = path;
-    }
-    delWithStart(pattern: string): Promise<number> {
-        throw new Error("Method not implemented.");
-    }
-
-    async load(key: string, ttl: number, hash: string = ''): Promise<any> {
-        const file = this.getPath(key);
-
-        if (fs.existsSync(file) && (fs.statSync(file).mtime.getTime() + ttl * 1000 > Date.now())) {
-            return fs.readFileSync(file, 'utf8');
-        }
-
-        return false;
-    }
-
-    async save(key: string, data: any, hash: string = ''): Promise<boolean | string | any[]> {
-        if (!data) {
-            return false;
-        }
-
-        const file = this.getPath(key);
-        const dir = path.dirname(file);
-
-        try {
-            if (!fs.existsSync(dir)) {
-                fs.mkdirSync(dir, { recursive: true });
-            }
-
-            fs.writeFileSync(file, data, { flag: 'w' });
-            return data;
-        } catch (e: any) {
-            throw new Error(e.message);
-        }
-    }
-
-    async list(key: string): Promise<string[]> {
-        return [];
-    }
-
-    async purge(key: string, hash: string = ''): Promise<boolean> {
-        const file = this.getPath(key);
-
-        if (fs.existsSync(file)) {
-            fs.unlinkSync(file);
-            return true;
-        }
-
-        return false;
-    }
-
-    async flush(): Promise<boolean> {
-        return this.deleteDirectory(this.path);
-    }
-
-    async ping(): Promise<boolean> {
-        return fs.existsSync(this.path) && fs.accessSync(this.path, fs.constants.W_OK | fs.constants.R_OK);
-    }
-
-    async getSize(): Promise<number> {
-        try {
-            return this.getDirectorySize(path.dirname(this.path));
-        } catch {
-            return 0;
-        }
-    }
-
-    private getDirectorySize(dir: string): number {
-        let size = 0;
-        const normalizedPath = path.join(dir, '*');
-
-        const paths = glob.sync(normalizedPath, { nodir: false });
-        if (!paths) {
-            return size;
-        }
-
-        for (const p of paths) {
-            if (fs.statSync(p).isFile()) {
-                size += fs.statSync(p).size;
-            } else if (fs.statSync(p).isDirectory()) {
-                size += this.getDirectorySize(p);
-            }
-        }
-
-        return size;
-    }
-
-    getPath(filename: string): string {
-        return path.join(this.path, filename);
-    }
-
-    protected deleteDirectory(dirPath: string): boolean {
-        if (!fs.statSync(dirPath).isDirectory()) {
-            throw new Error(`${dirPath} must be a directory`);
-        }
-
-        if (!dirPath.endsWith('/')) {
-            dirPath += '/';
-        }
-
-        const files = glob.sync(dirPath + '*', { mark: true });
-
-        if (!files) {
-            throw new Error('Error happened during glob');
-        }
-
-        for (const file of files) {
-            if (fs.statSync(file).isDirectory()) {
-                this.deleteDirectory(file);
-            } else {
-                fs.unlinkSync(file);
-            }
-        }
-
-        return fs.rmdirSync(dirPath);
-    }
-}

package/src/Cache/Adapters/Memory.ts

@@ -1,57 +0,0 @@
-import { Adapter } from "../Adapter";
-
-export class Memory implements Adapter {
-    public store: { [key: string]: { time: number, data: any } } = {};
-
-    constructor() {}
-    delWithStart(pattern: string): Promise<number> {
-        throw new Error("Method not implemented.");
-    }
-
-    async load(key: string, ttl: number, hash: string = ''): Promise<any> {
-        if (key && this.store[key]) {
-            const saved = this.store[key];
-            return (saved.time + ttl > Date.now() / 1000) ? saved.data : false;
-        }
-        return false;
-    }
-
-    async save(key: string, data: any, hash: string = ''): Promise<boolean | string | any[]> {
-        if (!key || !data) {
-            return false;
-        }
-
-        const saved = {
-            time: Date.now() / 1000,
-            data: data,
-        };
-
-        this.store[key] = saved;
-        return data;
-    }
-
-    async list(key: string): Promise<string[]> {
-        return [];
-    }
-
-    async purge(key: string, hash: string = ''): Promise<boolean> {
-        if (key && this.store[key]) {
-            delete this.store[key];
-            return true;
-        }
-        return false;
-    }
-
-    async flush(): Promise<boolean> {
-        this.store = {};
-        return true;
-    }
-
-    async ping(): Promise<boolean> {
-        return true;
-    }
-
-    async getSize(): Promise<number> {
-        return Object.keys(this.store).length;
-    }
-}

package/src/Cache/Adapters/None.ts

@@ -1,36 +0,0 @@
-import { Adapter } from "../Adapter";
-
-export class None implements Adapter {
-    constructor() {}
-    delWithStart(pattern: string): Promise<number> {
-        throw new Error("Method not implemented.");
-    }
-
-    async load(key: string, ttl: number, hash: string = ''): Promise<any> {
-        return false;
-    }
-
-    async save(key: string, data: any, hash: string = ''): Promise<boolean | string | any[]> {
-        return false;
-    }
-
-    async list(key: string): Promise<string[]> {
-        return [];
-    }
-
-    async purge(key: string, hash: string = ''): Promise<boolean> {
-        return true;
-    }
-
-    async flush(): Promise<boolean> {
-        return true;
-    }
-
-    async ping(): Promise<boolean> {
-        return true;
-    }
-
-    async getSize(): Promise<number> {
-        return 0;
-    }
-}

package/src/Cache/Adapters/Redis.ts

@@ -1,106 +0,0 @@
-import { RedisClientType, } from 'redis';
-import { Adapter } from "../Adapter";
-
-
-export class Redis implements Adapter {
-    protected redis: RedisClientType;
-
-    constructor(redis: RedisClientType) {
-        this.redis = redis;
-    }
-
-    async load(key: string, ttl: number, hash: string = ''): Promise<any> {
-        if (!hash) {
-            hash = key;
-        }
-
-        return new Promise((resolve) => {
-            try {
-                this.redis.get(key).then((redisString) => {
-                    if (!redisString) {
-                        resolve(null);
-                    }
-
-                    const cache = JSON.parse(redisString);
-                    if (cache != null && cache.time + ttl > Date.now() / 1000) {
-                        resolve(cache.data);
-                    } else {
-                        resolve(null);
-                    }
-                })
-                    .catch((e) => {
-                        console.error('redis error');
-                    })
-            }
-            catch (e) {
-                console.error('redis error');
-            }
-        })
-    }
-
-    async save(key: string, data: any, hash: string = ''): Promise<boolean | string | any[]> {
-        if (!key || !data) {
-            return Promise.resolve(false);
-        }
-
-        if (!hash) {
-            hash = key;
-        }
-
-        const value = JSON.stringify({
-            time: Date.now() / 1000,
-            data: data,
-        });
-
-        return this.redis.set(key, value).then(() => data).catch(() => false);
-    }
-
-    list(key: string): Promise<string[]> {
-
-        return this.redis.hKeys(key).then((keys) => keys || []);
-    }
-
-    async purge(key: string, hash: string = ''): Promise<boolean> {
-        if (hash) {
-            return this.redis.del(key).then((result) => !!result);
-        }
-
-        const result = await this.redis.del(key);
-
-        return !!result;
-    }
-
-    flush(): Promise<boolean> {
-        //@ts-ignore
-        return this.redis.flushall().then(() => true);
-    }
-
-    ping(): Promise<boolean> {
-        return this.redis.ping().then(() => true).catch(() => false);
-    }
-
-    getSize(): Promise<number> {
-        //@ts-ignore
-        return this.redis.dbsize();
-    }
-
-    async delWithStart(pattern: string): Promise<number> {
-        
-        let cur = 0;
-        let totalDeleted = 0;
-
-        do {
-            const {cursor, keys} = await this.redis.scan(cur, {
-                MATCH: `${pattern}:*`,
-                COUNT: 100, // Her taramada maksimum 100 anahtar döndür
-            }) as any;
-
-           
-            cur = Number(cursor);
-
-            await Promise.all(keys.map ((key: string) => this.redis.del(key)))
-        } while (cur !== 0);
-
-        return totalDeleted;
-    }
-}

package/src/Cache/Adapters/Sharding.ts

@@ -1,87 +0,0 @@
-import { Adapter } from "../Adapter";
-
-    export class Sharding implements Adapter {
-        protected adapters: Adapter[];
-        protected count: number = 0;
-
-        constructor(adapters: Adapter[]) {
-            if (adapters.length === 0) {
-                throw new Error('No adapters provided');
-            }
-
-            this.count = adapters.length;
-            this.adapters = adapters;
-        }
-        delWithStart(pattern: string): Promise<number> {
-            throw new Error("Method not implemented.");
-        }
-
-      async  load(key: string, ttl: number, hash: string = ''): Promise<any> {
-            const adapter =  this.getAdapter(key);
-            return await adapter.load(key, ttl, hash);
-        }
-
-        async save(key: string, data: any, hash: string = ''): Promise<boolean | string | any[]> {
-            return this.getAdapter(key).save(key, data, hash);
-        }
-
-        async list(key: string): Promise<string[]> {
-            return this.getAdapter(key).list(key);
-        }
-
-        async purge(key: string, hash: string = ''): Promise<boolean> {
-            return this.getAdapter(key).purge(key, hash);
-        }
-
-        async flush(): Promise<boolean> {
-            let result = true;
-            for (const adapter of this.adapters) {
-                result = await adapter.flush() ? result : false;
-            }
-            return result;
-        }
-
-        async ping(): Promise<boolean> {
-            for (const adapter of this.adapters) {
-                if (!adapter.ping()) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        async getSize(): Promise<number> {
-            let size = 0;
-            for (const adapter of this.adapters) {
-                size += await adapter.getSize();
-            }
-            return size;
-        }
-
-        protected getAdapter(key: string): Adapter {
-            const hash = this.crc32(key);
-            const index = hash % this.count;
-            return this.adapters[index];
-        }
-
-        private crc32(str: string): number {
-            let crc = 0 ^ (-1);
-            for (let i = 0; i < str.length; i++) {
-                crc = (crc >>> 8) ^ this.crc32Table[(crc ^ str.charCodeAt(i)) & 0xff];
-            }
-            return (crc ^ (-1)) >>> 0;
-        }
-
-        private crc32Table = (() => {
-            let c: number;
-            const table: number[] = [];
-            for (let n = 0; n < 256; n++) {
-                c = n;
-                for (let k = 0; k < 8; k++) {
-                    c = ((c & 1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
-                }
-                table[n] = c;
-            }
-            return table;
-        })();
-    }

package/src/Cache/Cache.ts

@@ -1,75 +0,0 @@
-import { Adapter } from "./Adapter";
-
-
-export class Cache {
-    private adapter: Adapter;
-    public static caseSensitive: boolean = false;
-
-    constructor(adapter: Adapter) {
-        this.adapter = adapter;
-    }
-
-    private constructKey(key: any): string {
-        if (Array.isArray(key)) {
-            key = key.join(':');
-        }
-
-        return key;
-    }
-
-    public static setCaseSensitivity(value: boolean): boolean {
-        return this.caseSensitive = value;
-    }
-
-    public async load(key: string | string[], ttl: number = 60 * 60 * 24, hash: string = ''): Promise<any> {
-        key = this.constructKey(key);
-        key = Cache.caseSensitive ? key : key.toLowerCase();
-        hash = Cache.caseSensitive ? hash : hash.toLowerCase();
-
-        return await this.adapter.load(key, ttl, hash);
-    }
-
-    public async save(key: string | string[], data: any, hash: string = ''): Promise<boolean | string | any[]> {
-
-        key = this.constructKey(key);
-
-        key = Cache.caseSensitive ? key : key.toLowerCase();
-        hash = Cache.caseSensitive ? hash : hash.toLowerCase();
-
-        return this.adapter.save(key, data, hash);
-    }
-
-    public async list(key: string | string[]): Promise<string[]> {
-        key = this.constructKey(key);
-        key = Cache.caseSensitive ? key : key.toLowerCase();
-
-        return this.adapter.list(key);
-    }
-
-    public async purge(key: string | string[], hash: string = ''): Promise<boolean> {
-
-        key = this.constructKey(key);
-
-        key = Cache.caseSensitive ? key : key.toLowerCase();
-        hash = Cache.caseSensitive ? hash : hash.toLowerCase();
-
-        return this.adapter.purge(key, hash);
-    }
-
-    public async flush(): Promise<boolean> {
-        return this.adapter.flush();
-    }
-
-    public async ping(): Promise<boolean> {
-        return this.adapter.ping();
-    }
-
-    public async getSize(): Promise<number> {
-        return this.adapter.getSize();
-    }
-
-    public async delWithStart(keys: string | string[]): Promise<number> {
-        const pattern = this.constructKey(keys);
-        return this.adapter.delWithStart(pattern);
-    }
-}

package/src/Cache/index.ts

@@ -1,5 +0,0 @@
-export * from './Cache';
-export * from './Adapters/None';
-export * from './Adapters/Redis';
-export * from './Adapters/Sharding';
-export * from './Adapters/Memory';

package/src/Services.ts

@@ -1,42 +0,0 @@
-import { Registry } from "./lib/Registry";
-import { createClient } from 'redis';
-import { Redis } from "./Cache/Adapters/Redis";
-import { Cache } from "./Cache";
-import 'server-only'
-
-
-export const registry = new Registry();
-
-registry.set('cache', () => {
-    const client = createClient({
-        socket: {
-            host: process.env._APP_REDIS_HOST ?? 'localhost',
-            port: Number.parseInt(process.env._APP_REDIS_PORT ?? '6379'),
-
-        },
-        password: undefined,
-    });
-
-    // Bağlantı hatalarını ele al
-    client.on('error', (err) => {
-
-        console.error('Redis Client Error', err);
-    });
-
-    // Connect to Redis
-    client.connect();
-
-    const redisAdapter = new Redis(client as any);
-
-    const cacheProvider = new Cache(redisAdapter);
-
-    return cacheProvider;
-
-})
-
-export class Services {
-    public static get Cache(): Cache {
-        return registry.get('cache');
-    }
-   
-}

package/src/decorators/Cache.ts

@@ -1,102 +0,0 @@
-import { Services } from '../Services';
-
-function stableStringify(obj: any): string {
-    if (obj && typeof obj === "object" && !Array.isArray(obj)) {
-        return `{${Object.keys(obj).sort().map(key => `"${key}":${stableStringify(obj[key])}`).join(",")}}`;
-    }
-    return JSON.stringify(obj);
-}
-
-function generateCacheKey(...args: any[]): string {
-    return stableStringify(args);
-}
-
-
-// console.log(generateCacheKey("user", 123, true, { role: "admin", permissions: ["read", "write"] }));
-// console.log(generateCacheKey("user", 123, true, { permissions: ["read", "write"], role: "admin" }));
-
-
-
-export function Cache(/* cacheKey?: string | string[] */) {
-    return function (
-        target: any,
-        propertyKey: string,
-        descriptor: PropertyDescriptor
-    ) {
-        const originalMethod = descriptor.value;
-
-        descriptor.value = async function (...args: any[]) {
-
-            const className = target.constructor.name.toLowerCase();
-
-            // Metod adı
-            const methodName = propertyKey.toLowerCase();
-
-            const cacheKeys: any[] = [target.__cacheKeys || []].reverse();
-            console.log("Defined cache keys:", cacheKeys);
-
-            const cacheKey = ['admin', className, propertyKey];
-
-            if (cacheKeys.length > 0) {
-                for (let i = 0; i < cacheKeys.length; i++) {
-                    const keyIndex = cacheKeys[i]['parameterIndex'];
-                    if (args != null && args[keyIndex] != null) {
-                        const key = args[keyIndex].toString();
-                        cacheKey.push(key);
-                    }
-                }
-            } else if (args.length > 0) { //cacheKey belirtilmemisse tum parametreleri kullan
-                for (let i = 0; i < args.length; i++) {
-                    const key = args[i].toString();
-                    cacheKey.push(key);
-                }
-            }
-
-            // Cache key'i dizeye dönüştür
-            // const key = Array.isArray(cacheKey) ? cacheKey.join(':') : cacheKey;
-
-            // Cache'ten veri al
-            let cachedData = await Services.Cache.load(cacheKey);
-
-            if (cachedData != null) {
-                return cachedData; // Cache'teki veriyi döndür
-            }
-
-            // Orijinal metodu çağır ve dönen değeri cache'e kaydet
-            const result = await originalMethod.apply(this, args);
-
-            // Cache'e kaydet (asenkron yapılır, beklenmez)
-            Services.Cache.save(cacheKey, result);
-            console.log('------------------------------Cache executed..')
-            return result;
-        };
-
-        return descriptor;
-    };
-}
-
-
-/* const cacheKeys: any[] = target.__cacheKeys || [];
-console.log("Defined cache keys:", [...cacheKeys].reverse());
-
-const className = target.constructor.name.toLowerCase();
-
-// Metod adı
-const methodName = propertyKey.toLowerCase();
-
-debugger
-const cacheKey = ['admin', className, propertyKey];
-if (cacheKey.length > 0) {
-    for (let i = 0; i < cacheKeys.length; i++) {
-        const keyIndex = cacheKeys[i]['parameterIndex'];
-        if (args != null && args[keyIndex] != null) {
-            const key = args[keyIndex].toString();
-            cacheKey.push(key);
-        }
-    }
-} else if (args.length > 0) { //cacheKey belirtilmemisse tum parametreleri kullan
-    for (let i = 0; i < args.length; i++) {
-        const key = args[i].toString();
-        cacheKey.push(key);
-    }
-} */

package/src/decorators/CacheKey.ts

@@ -1,9 +0,0 @@
-
-export function CacheKey() {
-    return function (target: any, propertyKey: string | symbol, parameterIndex: number): void {
-        if (!target.__cacheKeys) {
-            target.__cacheKeys = [];
-        }
-        target.__cacheKeys.push({ propertyKey, parameterIndex });
-    };
-}

package/src/decorators/Invalidate.ts

@@ -1,68 +0,0 @@
-import { Services } from '../Services';
-
-export function Invalidate(keys: string | string[]) {
-    return function (
-        target: any,
-        propertyKey: string,
-        descriptor: PropertyDescriptor
-    ) {
-        const originalMethod = descriptor.value;
-
-        descriptor.value = async function (...args: any[]) {
-
-            const className = target.constructor.name.toLowerCase();
-
-            // Metod adı
-            const methodName = propertyKey.toLowerCase();
-
-
-
-            const cacheKey = ['admin', className];
-
-
-
-
-            // Orijinal metodu çağır ve dönen değeri cache'e kaydet
-            const result = await originalMethod.apply(this, args);
-
-            // Cache'e kaydet (asenkron yapılır, beklenmez)
-
-            for (let key of keys) {
-                Services.Cache.purge([...cacheKey, key]);
-                Services.Cache.delWithStart([...cacheKey, key]);
-            }
-
-
-            console.log('------------------------------Cache deleted.')
-            return result;
-        };
-
-        return descriptor;
-    };
-}
-
-
-/* const cacheKeys: any[] = target.__cacheKeys || [];
-console.log("Defined cache keys:", [...cacheKeys].reverse());
-
-const className = target.constructor.name.toLowerCase();
-
-// Metod adı
-const methodName = propertyKey.toLowerCase();
-
-debugger
-const cacheKey = ['admin', className, propertyKey];
-if (cacheKey.length > 0) {
-    for (let i = 0; i < cacheKeys.length; i++) {
-        const keyIndex = cacheKeys[i]['parameterIndex'];
-        if (args != null && args[keyIndex] != null) {
-            const key = args[keyIndex].toString();
-            cacheKey.push(key);
-        }
-    }
-} else if (args.length > 0) { //cacheKey belirtilmemisse tum parametreleri kullan
-    for (let i = 0; i < args.length; i++) {
-        const key = args[i].toString();
-        cacheKey.push(key);
-    }
-} */