Skip to content

Commit 6b0d3bb

Browse files
yaroslav8765yaroslav8765
committed
chore: use logge instead of HEAVY_DEBUG
1 parent cc90b21 commit 6b0d3bb

File tree

10 files changed

+121
-120
lines changed

10 files changed

+121
-120
lines changed

‎adminforth/basePlugin.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import fs from 'fs';
66

77
import crypto from 'crypto';
88

9+
import { afLogger } from './modules/logger.js';
10+
911

1012
export default class AdminForthPlugin implements IAdminForthPlugin {
1113

@@ -24,7 +26,7 @@ export default class AdminForthPlugin implements IAdminForthPlugin {
2426
this.pluginDir = currentFileDir(metaUrl);
2527
this.customFolderPath = path.join(this.pluginDir, this.customFolderName);
2628
this.pluginOptions = pluginOptions;
27-
process.env.HEAVY_DEBUG && console.log(`🪲 🪲 AdminForthPlugin.constructor`, this.constructor.name);
29+
afLogger.trace(`🪲 🪲 AdminForthPlugin.constructor ${this.constructor.name}`);
2830
this.className = this.constructor.name;
2931
}
3032

@@ -42,7 +44,7 @@ export default class AdminForthPlugin implements IAdminForthPlugin {
4244

4345
const seed = `af_pl_${this.constructor.name}_${resourceConfig.resourceId}_${uniqueness}`;
4446
this.pluginInstanceId = md5hash(seed);
45-
process.env.HEAVY_DEBUG && console.log(`🪲 AdminForthPlugin.modifyResourceConfig`, seed, 'id', this.pluginInstanceId);
47+
afLogger.trace(`🪲 AdminForthPlugin.modifyResourceConfig, ${seed}, 'id', ${this.pluginInstanceId}`);
4648
this.adminforth = adminforth;
4749
}
4850

‎adminforth/commands/callTsProxy.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import path from "path";
44
import fs from "fs";
55
import chalk from "chalk";
66
import dotenv from "dotenv";
7+
import { afLogger } from './modules/logger.js';
78

89
const currentFilePath = import.meta.url;
910
const currentFileFolder = path.dirname(currentFilePath).replace("file:", "");
@@ -20,7 +21,7 @@ export function callTsProxy(tsCode, silent=false) {
2021
dotenv.config({ path: envPath, override: true });
2122
}
2223

23-
process.env.HEAVY_DEBUG && console.log("🌐 Calling tsproxy with code:", path.join(currentFileFolder, "proxy.ts"));
24+
afLogger.trace("🌐 Calling tsproxy with code:", path.join(currentFileFolder, "proxy.ts"));
2425
return new Promise((resolve, reject) => {
2526
const child = spawn("tsx", [path.join(currentFileFolder, "proxy.ts")], {
2627
env: process.env,
@@ -59,14 +60,14 @@ export function callTsProxy(tsCode, silent=false) {
5960
}
6061
});
6162

62-
process.env.HEAVY_DEBUG && console.log("🪲 Writing to tsproxy stdin...\n'''", tsCode, "'''");
63+
afLogger.trace("🪲 Writing to tsproxy stdin...\n'''", tsCode, "'''");
6364
child.stdin.write(tsCode);
6465
child.stdin.end();
6566
});
6667
}
6768

6869
export async function findAdminInstance() {
69-
process.env.HEAVY_DEBUG && console.log("🌐 Finding admin instance...");
70+
afLogger.trace("🌐 Finding admin instance...");
7071
const currentDirectory = process.cwd();
7172

7273
let files = fs.readdirSync(currentDirectory);
@@ -83,7 +84,7 @@ export async function findAdminInstance() {
8384
for (const file of files) {
8485
if (file.endsWith(".ts")) {
8586
const fileNoTs = file.replace(/\.ts$/, "");
86-
process.env.HEAVY_DEBUG && console.log(`🪲 Trying bundleing ${file}...`);
87+
afLogger.trace(`🪲 Trying bundleing ${file}...`);
8788
try {
8889
const res = await callTsProxy(`
8990
import { admin } from './${fileNoTs}.js';
@@ -104,7 +105,7 @@ export async function findAdminInstance() {
104105
console.error(chalk.red(`Error running ${file}:`, e));
105106
process.exit(1);
106107
}
107-
process.env.HEAVY_DEBUG && console.log(`🪲 File ${file} failed`, e);
108+
afLogger.trace(`🪲 File ${file} failed`, e);
108109
}
109110
}
110111
}

‎adminforth/commands/proxy.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { writeFile, unlink } from 'fs/promises';
33
import { randomUUID } from 'crypto';
44
import { pathToFileURL } from 'url';
55
import path from 'path';
6+
import { afLogger } from './modules/logger.js';
67

78
(async () => {
89
const chunks: Buffer[] = [];
@@ -23,8 +24,8 @@ import path from 'path';
2324
capturedLogs.push(args);
2425
}
2526

26-
process.env.HEAVY_DEBUG && console.log(`🪲 TMP proxy file: ${tmpFile}`);
27-
process.env.HEAVY_DEBUG && console.log(`🪲 Current working directory: ${process.cwd()}`);
27+
afLogger.trace(`🪲 TMP proxy file: ${tmpFile}`);
28+
afLogger.trace(`🪲 Current working directory: ${process.cwd()}`);
2829

2930
try {
3031
// Save code to a temp file

‎adminforth/dataConnectors/baseConnector.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { suggestIfTypo } from "../modules/utils.js";
1010
import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from "../types/Common.js";
1111
import { randomUUID } from "crypto";
1212
import dayjs from "dayjs";
13+
import { afLogger } from '../modules/logger.js';
1314

1415

1516
export default class AdminForthBaseConnector implements IAdminForthDataSourceConnectorBase {
@@ -138,7 +139,7 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
138139
);
139140
}
140141
if (isPolymorphicTarget) {
141-
process.env.HEAVY_DEBUG && console.log(`⚠️ Field '${filtersAsSingle.field}' not found in polymorphic target resource '${resource.resourceId}', allowing query to proceed.`);
142+
afLogger.trace(`⚠️ Field '${filtersAsSingle.field}' not found in polymorphic target resource '${resource.resourceId}', allowing query to proceed.`);
142143
return { ok: true, error: '' };
143144
} else {
144145
throw new Error(`Field '${filtersAsSingle.field}' not found in resource '${resource.resourceId}'. ${similar ? `Did you mean '${similar}'?` : ''}`);
@@ -329,7 +330,7 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
329330
}
330331

331332
async checkUnique(resource: AdminForthResource, column: AdminForthResourceColumn, value: any, record?: any): Promise<boolean> {
332-
process.env.HEAVY_DEBUG && console.log('☝️🪲🪲🪲🪲 checkUnique|||', column, value);
333+
afLogger.trace('☝️🪲🪲🪲🪲 checkUnique|||', column, value);
333334

334335
const primaryKeyField = this.getPrimaryKey(resource);
335336
const existingRecord = await this.getData({
@@ -385,11 +386,11 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
385386
})
386387
);
387388
if (error) {
388-
process.env.HEAVY_DEBUG && console.log('🪲🆕 check unique error', error);
389+
afLogger.trace('🪲🆕 check unique error', error);
389390
return { error, ok: false };
390391
}
391392

392-
process.env.HEAVY_DEBUG && console.log('🪲🆕 creating record',JSON.stringify(recordWithOriginalValues));
393+
afLogger.trace('🪲🆕 creating record',JSON.stringify(recordWithOriginalValues));
393394
let pkValue = await this.createRecordOriginalValues({ resource, record: recordWithOriginalValues });
394395
if (recordWithOriginalValues[this.getPrimaryKey(resource)] !== undefined) {
395396
// some data sources always return some value for pk, even if it is was not auto generated
@@ -441,12 +442,12 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
441442
})
442443
);
443444
if (error) {
444-
process.env.HEAVY_DEBUG && console.log('🪲🆕 check unique error', error);
445+
afLogger.trace('🪲🆕 check unique error', error);
445446
return { error, ok: false };
446447
}
447448

448449

449-
process.env.HEAVY_DEBUG && console.log(`🪲✏️ updating record id:${recordId}, values: ${JSON.stringify(recordWithOriginalValues)}`);
450+
afLogger.trace(`🪲✏️ updating record id:${recordId}, values: ${JSON.stringify(recordWithOriginalValues)}`);
450451

451452
await this.updateRecordOriginalValues({ resource, recordId, newValues: recordWithOriginalValues });
452453

‎adminforth/index.ts‎

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import AdminForthRestAPI, { interpretResource } from './modules/restApi.js';
3434
import ClickhouseConnector from './dataConnectors/clickhouse.js';
3535
import OperationalResource from './modules/operationalResource.js';
3636
import SocketBroker from './modules/socketBroker.js';
37+
import { afLogger } from './modules/logger.js';
3738

3839
// exports
3940
export * from './types/Back.js';
@@ -124,62 +125,62 @@ class AdminForth implements IAdminForth {
124125
}
125126

126127
constructor(config: AdminForthInputConfig) {
127-
process.env.HEAVY_DEBUG && console.log('🔧 AdminForth constructor started');
128+
afLogger.trace('🔧 AdminForth constructor started');
128129

129130
if (global.adminforth) {
130131
throw new Error('AdminForth instance already created in this process. '+
131132
'If you want to use multiple instances, consider using different process for each instance');
132133
}
133134

134-
process.env.HEAVY_DEBUG && console.log('🔧 Creating CodeInjector...');
135+
afLogger.trace('🔧 Creating CodeInjector...');
135136
this.codeInjector = new CodeInjector(this);
136-
process.env.HEAVY_DEBUG && console.log('🔧 CodeInjector created');
137+
afLogger.trace('🔧 CodeInjector created');
137138

138-
process.env.HEAVY_DEBUG && console.log('🔧 Creating ConfigValidator...');
139+
afLogger.trace('🔧 Creating ConfigValidator...');
139140
this.configValidator = new ConfigValidator(this, config);
140-
process.env.HEAVY_DEBUG && console.log('🔧 ConfigValidator created');
141+
afLogger.trace('🔧 ConfigValidator created');
141142

142-
process.env.HEAVY_DEBUG && console.log('🔧 Creating AdminForthRestAPI...');
143+
afLogger.trace('🔧 Creating AdminForthRestAPI...');
143144
this.restApi = new AdminForthRestAPI(this);
144-
process.env.HEAVY_DEBUG && console.log('🔧 AdminForthRestAPI created');
145+
afLogger.trace('🔧 AdminForthRestAPI created');
145146

146-
process.env.HEAVY_DEBUG && console.log('🔧 Creating SocketBroker...');
147+
afLogger.trace('🔧 Creating SocketBroker...');
147148
this.websocket = new SocketBroker(this);
148-
process.env.HEAVY_DEBUG && console.log('🔧 SocketBroker created');
149+
afLogger.trace('🔧 SocketBroker created');
149150

150151
this.activatedPlugins = [];
151152

152-
process.env.HEAVY_DEBUG && console.log('🔧 Validating config...');
153+
afLogger.trace('🔧 Validating config...');
153154
this.configValidator.validateConfig();
154-
process.env.HEAVY_DEBUG && console.log('🔧 Config validated');
155+
afLogger.trace('🔧 Config validated');
155156

156-
process.env.HEAVY_DEBUG && console.log('🔧 Activating plugins...');
157+
afLogger.trace('🔧 Activating plugins...');
157158
this.activatePlugins();
158-
process.env.HEAVY_DEBUG && console.log('🔧 Plugins activated');
159+
afLogger.trace('🔧 Plugins activated');
159160

160-
process.env.HEAVY_DEBUG && console.log('🔧 Validating after plugin activation...');
161+
afLogger.trace('🔧 Validating after plugin activation...');
161162
this.configValidator.validateAfterPluginsActivation();
162-
process.env.HEAVY_DEBUG && console.log('🔧 Config validated');
163+
afLogger.trace('🔧 Config validated');
163164

164-
process.env.HEAVY_DEBUG && console.log('🔧 Creating ExpressServer...');
165+
afLogger.trace('🔧 Creating ExpressServer...');
165166
this.express = new ExpressServer(this);
166-
process.env.HEAVY_DEBUG && console.log('🔧 ExpressServer created');
167+
afLogger.trace('🔧 ExpressServer created');
167168

168169
// this.fastify = new FastifyServer(this);
169-
process.env.HEAVY_DEBUG && console.log('🔧 Creating AdminForthAuth...');
170+
afLogger.trace('🔧 Creating AdminForthAuth...');
170171
this.auth = new AdminForthAuth(this);
171-
process.env.HEAVY_DEBUG && console.log('🔧 AdminForthAuth created');
172+
afLogger.trace('🔧 AdminForthAuth created');
172173

173174
this.connectors = {};
174175
this.statuses = {
175176
dbDiscover: 'running',
176177
};
177178

178179
console.log(`${this.formatAdminForth()} v${ADMINFORTH_VERSION} initializing...`);
179-
process.env.HEAVY_DEBUG && console.log('🔧 About to set global.adminforth...');
180+
afLogger.trace('🔧 About to set global.adminforth...');
180181
global.adminforth = this;
181-
process.env.HEAVY_DEBUG && console.log('🔧 global.adminforth set successfully');
182-
process.env.HEAVY_DEBUG && console.log('🔧 AdminForth constructor completed');
182+
afLogger.trace('🔧 global.adminforth set successfully');
183+
afLogger.trace('🔧 AdminForth constructor completed');
183184
}
184185

185186
formatAdminForth() {
@@ -202,25 +203,25 @@ class AdminForth implements IAdminForth {
202203
}
203204

204205
activatePlugins() {
205-
process.env.HEAVY_DEBUG && console.log('🔌🔌🔌 Activating plugins');
206+
afLogger.trace('🔌🔌🔌 Activating plugins');
206207
const allPluginInstances = [];
207208
for (let resource of this.config.resources) {
208-
process.env.HEAVY_DEBUG && console.log(`🔌 Checking plugins for resource: ${resource.resourceId}`);
209+
afLogger.trace(`🔌 Checking plugins for resource: ${resource.resourceId}`);
209210
for (let pluginInstance of resource.plugins || []) {
210-
process.env.HEAVY_DEBUG && console.log(`🔌 Found plugin: ${pluginInstance.constructor.name} for resource ${resource.resourceId}`);
211+
afLogger.trace(`🔌 Found plugin: ${pluginInstance.constructor.name} for resource ${resource.resourceId}`);
211212
allPluginInstances.push({pi: pluginInstance, resource});
212213
}
213214
}
214-
process.env.HEAVY_DEBUG && console.log(`🔌 Total plugins to activate: ${allPluginInstances.length}`);
215+
afLogger.trace(`🔌 Total plugins to activate: ${allPluginInstances.length}`);
215216

216217
let activationLoopCounter = 0;
217218
while (true) {
218219
activationLoopCounter++;
219220
if (activationLoopCounter > 10) {
220221
throw new Error('Plugin activation loop exceeded 10 iterations, possible infinite loop (some plugin tries to activate himself in a loop)');
221222
}
222-
process.env.HEAVY_DEBUG && console.log(`🔌 Plugin activation loop iteration: ${activationLoopCounter}`);
223-
process.env.HEAVY_DEBUG && console.log(`🔌 Activated plugins count: ${this.activatedPlugins.length}/${allPluginInstances.length}`);
223+
afLogger.trace(`🔌 Plugin activation loop iteration: ${activationLoopCounter}`);
224+
afLogger.trace(`🔌 Activated plugins count: ${this.activatedPlugins.length}/${allPluginInstances.length}`);
224225
const allPluginsAreActivated = allPluginInstances.length === this.activatedPlugins.length;
225226
if (allPluginsAreActivated) {
226227
break;
@@ -230,33 +231,33 @@ class AdminForth implements IAdminForth {
230231
!this.activatedPlugins.find((p) => p.pluginInstanceId === pluginInstance.pluginInstanceId)
231232
);
232233

233-
process.env.HEAVY_DEBUG && console.log(`🔌 Unactivated plugins remaining: ${unactivatedPlugins.length}`);
234+
afLogger.trace(`🔌 Unactivated plugins remaining: ${unactivatedPlugins.length}`);
234235

235-
process.env.HEAVY_DEBUG && console.log(`🔌 Unactivated plugins count: ${unactivatedPlugins.length}`);
236+
afLogger.trace(`🔌 Unactivated plugins count: ${unactivatedPlugins.length}`);
236237

237238
unactivatedPlugins.sort(({pi: a}, {pi: b}) => a.activationOrder - b.activationOrder);
238-
process.env.HEAVY_DEBUG && console.log(`🔌 Activating plugins in order:`, unactivatedPlugins.map(({pi}) => pi.constructor.name));
239+
afLogger.trace(`🔌 Activating plugins in order: ${unactivatedPlugins.map(({pi}) => pi.constructor.name)}`);
239240
unactivatedPlugins.forEach(
240241
({pi: pluginInstance, resource}, index) => {
241-
process.env.HEAVY_DEBUG && console.log("Activating plugin:",pluginInstance.constructor.name)
242-
process.env.HEAVY_DEBUG && console.log(`🔌 Activating plugin ${index + 1}/${allPluginInstances.length}: ${pluginInstance.constructor.name} for resource ${resource.resourceId}`);
242+
afLogger.trace(`Activating plugin: ${pluginInstance.constructor.name}`);
243+
afLogger.trace(`🔌 Activating plugin ${index + 1}/${allPluginInstances.length}: ${pluginInstance.constructor.name} for resource ${resource.resourceId}`);
243244
pluginInstance.modifyResourceConfig(this, resource, allPluginInstances);
244-
process.env.HEAVY_DEBUG && console.log(`🔌 Plugin ${pluginInstance.constructor.name} modifyResourceConfig completed`);
245+
afLogger.trace(`🔌 Plugin ${pluginInstance.constructor.name} modifyResourceConfig completed`);
245246

246247
const plugin = this.activatedPlugins.find((p) => p.pluginInstanceId === pluginInstance.pluginInstanceId);
247248
if (plugin) {
248-
process.env.HEAVY_DEBUG && console.log(`Current plugin pluginInstance.pluginInstanceId ${pluginInstance.pluginInstanceId}`);
249+
afLogger.trace(`Current plugin pluginInstance.pluginInstanceId ${pluginInstance.pluginInstanceId}`);
249250

250251
throw new Error(`Attempt to activate Plugin ${pluginInstance.constructor.name} second time for same resource, but plugin does not support it.
251252
To support multiple plugin instance pre one resource, plugin should return unique string values for each installation from instanceUniqueRepresentation`);
252253
}
253254
this.activatedPlugins.push(pluginInstance);
254-
process.env.HEAVY_DEBUG && console.log(`🔌 Plugin ${pluginInstance.constructor.name} activated successfully`);
255+
afLogger.trace(`🔌 Plugin ${pluginInstance.constructor.name} activated successfully`);
255256
}
256257
);
257-
process.env.HEAVY_DEBUG && console.log(`🔌activated plugins:`, this.activatedPlugins.map((pi) => pi.constructor.name));
258+
afLogger.trace(`🔌activated plugins: ${this.activatedPlugins.map((pi) => pi.constructor.name)}`);
258259
}
259-
process.env.HEAVY_DEBUG && console.log('🔌 All plugins activation completed');
260+
afLogger.trace('🔌 All plugins activation completed');
260261
}
261262

262263
getPluginsByClassName<T>(className: string): T[] {
@@ -584,7 +585,7 @@ class AdminForth implements IAdminForth {
584585
}
585586
}
586587
const connector = this.connectors[resource.dataSource];
587-
process.env.HEAVY_DEBUG && console.log('🪲🆕 creating record createResourceRecord', record);
588+
afLogger.trace(`🪲🆕 creating record createResourceRecord, record: ${JSON.stringify(record)}`);
588589
const { error, createdRecord } = await connector.createRecord({ resource, record, adminUser });
589590
if ( error ) {
590591
return { error };
@@ -594,7 +595,7 @@ class AdminForth implements IAdminForth {
594595

595596
// execute hook if needed
596597
for (const hook of listify(resource.hooks?.create?.afterSave)) {
597-
process.env.HEAVY_DEBUG && console.log('🪲 Hook afterSave', hook);
598+
afLogger.trace(`🪲 Hook afterSave ${hook}`);
598599
const resp = await hook({
599600
recordId: primaryKey,
600601
resource,

0 commit comments

Comments
 (0)