@xenon-device-management/xenon 1.1.4 → 1.1.7

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xenon-device-management/xenon",
-    "version": "1.1.4",
+    "version": "1.1.7",
     "description": "Xenon - Intelligent Mobile Infrastructure. A self-healing device orchestration platform for Appium.",
     "main": "./lib/src/index.js",
     "exports": {
@@ -9,6 +9,7 @@
         "./package.json": "./package.json"
     },
     "scripts": {
+        "postinstall": "node scripts/generate-prisma.js",
         "build": "npx prisma generate && tsc -b && npm run build:copy",
         "build:all": "npm run build:xenon && npm run build",
         "build:copy": "rm -rf lib/public && mkdir -p lib && cp -R src/public lib/ && cp schema.json lib/",

package/lib/src/data-service/pending-sessions-service.js

@@ -12,14 +12,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addNewPendingSession = addNewPendingSession;
 exports.removePendingSession = removePendingSession;
 const device_store_1 = require("./device-store");
-const store = device_store_1.DeviceStoreFactory.getPendingSessionStore();
 function addNewPendingSession(capability) {
     return __awaiter(this, void 0, void 0, function* () {
+        const store = device_store_1.DeviceStoreFactory.getPendingSessionStore();
         yield store.addPendingSession(capability);
     });
 }
 function removePendingSession(sessionCapabilityId) {
     return __awaiter(this, void 0, void 0, function* () {
+        const store = device_store_1.DeviceStoreFactory.getPendingSessionStore();
         yield store.removePendingSession(sessionCapabilityId);
     });
 }

package/lib/src/data-service/prisma-service.js

@@ -9,19 +9,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrismaService = void 0;
-const client_1 = require("@prisma/client");
-const config_1 = require("../config");
+exports.getPrismaService = exports.PrismaService = void 0;
+const prisma_1 = require("../prisma");
 const typedi_1 = require("typedi");
-let PrismaService = class PrismaService extends client_1.PrismaClient {
-    constructor() {
-        super({
-            datasources: {
-                db: {
-                    url: config_1.config.databaseUrl,
-                },
-            },
-        });
+let PrismaService = class PrismaService {
+    constructor() { }
+    get client() {
+        return prisma_1.prisma;
     }
 };
 exports.PrismaService = PrismaService;
@@ -29,3 +23,6 @@ exports.PrismaService = PrismaService = __decorate([
     (0, typedi_1.Service)(),
     __metadata("design:paramtypes", [])
 ], PrismaService);
+// For compatibility with parts of the code that might expect PrismaService to be the client
+const getPrismaService = () => prisma_1.prisma;
+exports.getPrismaService = getPrismaService;

package/lib/src/data-service/prisma-store.js

@@ -51,8 +51,8 @@ const typedi_1 = require("typedi");
 const semver = __importStar(require("semver"));
 const logger_1 = __importDefault(require("../logger"));
 class PrismaDeviceStore {
-    constructor() {
-        this.prisma = typedi_1.Container.get(prisma_service_1.PrismaService);
+    get prisma() {
+        return typedi_1.Container.get(prisma_service_1.PrismaService).client;
     }
     toIDevice(device) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -275,8 +275,8 @@ class PrismaDeviceStore {
 }
 exports.PrismaDeviceStore = PrismaDeviceStore;
 class PrismaPendingSessionStore {
-    constructor() {
-        this.prisma = typedi_1.Container.get(prisma_service_1.PrismaService);
+    get prisma() {
+        return typedi_1.Container.get(prisma_service_1.PrismaService).client;
     }
     addPendingSession(capability) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -327,8 +327,8 @@ class PrismaPendingSessionStore {
 }
 exports.PrismaPendingSessionStore = PrismaPendingSessionStore;
 class PrismaCLIArgsStore {
-    constructor() {
-        this.prisma = typedi_1.Container.get(prisma_service_1.PrismaService);
+    get prisma() {
+        return typedi_1.Container.get(prisma_service_1.PrismaService).client;
     }
     addCLIArgs(args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -348,8 +348,8 @@ class PrismaCLIArgsStore {
 }
 exports.PrismaCLIArgsStore = PrismaCLIArgsStore;
 class PrismaHealEtalonStore {
-    constructor() {
-        this.prisma = typedi_1.Container.get(prisma_service_1.PrismaService);
+    get prisma() {
+        return typedi_1.Container.get(prisma_service_1.PrismaService).client;
     }
     saveSignature(etalon) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/src/data-service/queue-service.js

@@ -27,8 +27,8 @@ const prisma_service_1 = require("./prisma-service");
 const logger_1 = __importDefault(require("../logger"));
 const typedi_1 = require("typedi");
 let QueueService = class QueueService {
-    constructor(prisma) {
-        this.prisma = prisma;
+    constructor(prismaService) {
+        this.prismaService = prismaService;
         this.deviceStore = device_store_1.DeviceStoreFactory.getStore();
         this.pendingStore = device_store_1.DeviceStoreFactory.getPendingSessionStore();
     }
@@ -39,7 +39,7 @@ let QueueService = class QueueService {
     getAverageSessionDuration(platform) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const recentSessions = yield this.prisma.session.findMany({
+                const recentSessions = yield this.prismaService.client.session.findMany({
                     where: {
                         device_platform: platform.toLowerCase(),
                         endTime: { not: null },

package/lib/src/services/NotificationService.js

@@ -32,12 +32,12 @@ let NotificationService = class NotificationService {
     }
     getConfigs() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.prisma.webhookConfig.findMany();
+            return this.prisma.client.webhookConfig.findMany();
         });
     }
     saveConfig(url_1, events_1) {
         return __awaiter(this, arguments, void 0, function* (url, events, type = 'slack', payloadTemplate) {
-            return this.prisma.webhookConfig.create({
+            return this.prisma.client.webhookConfig.create({
                 data: {
                     url,
                     events: JSON.stringify(events),
@@ -50,7 +50,7 @@ let NotificationService = class NotificationService {
     }
     deleteConfig(id) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.prisma.webhookConfig.delete({ where: { id } });
+            yield this.prisma.client.webhookConfig.delete({ where: { id } });
         });
     }
     dispatchEvent(eventType, payload) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xenon-device-management/xenon",
-  "version": "1.1.4",
+  "version": "1.1.7",
   "description": "Xenon - Intelligent Mobile Infrastructure. A self-healing device orchestration platform for Appium.",
   "main": "./lib/src/index.js",
   "exports": {
@@ -9,6 +9,7 @@
     "./package.json": "./package.json"
   },
   "scripts": {
+    "postinstall": "node scripts/generate-prisma.js",
     "build": "npx prisma generate && tsc -b && npm run build:copy",
     "build:all": "npm run build:xenon && npm run build",
     "build:copy": "rm -rf lib/public && mkdir -p lib && cp -R src/public lib/ && cp schema.json lib/",

package/scripts/generate-prisma.js

@@ -0,0 +1,40 @@
+const { execSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+
+/**
+ * Robust Prisma Client Generator
+ * 
+ * This script runs 'prisma generate' but ensures that it doesn't 
+ * crash the npm install process if it fails.
+ */
+function generate() {
+    console.log('📦 [Xenon] Running Prisma client generation...');
+
+    try {
+        // Determine the path to prisma CLI
+        let prismaBin = path.resolve(__dirname, '../node_modules/.bin/prisma');
+        if (!fs.existsSync(prismaBin)) {
+            prismaBin = 'npx prisma'; // Fallback to npx
+        }
+
+        const command = `${prismaBin} generate`;
+        console.log(`🚀 [Xenon] Executing: ${command}`);
+
+        execSync(command, {
+            stdio: 'inherit',
+            cwd: path.resolve(__dirname, '..')
+        });
+
+        console.log('✅ [Xenon] Prisma client generated successfully.');
+    } catch (error) {
+        console.error('⚠️ [Xenon] Prisma client generation failed.');
+        console.error('⚠️ [Xenon] This is usually fine during installation; the client will be verified at runtime.');
+        console.error('⚠️ [Xenon] Error detail:', error.message);
+
+        // Crucial: Exit with 0 so npm install proceeds
+        process.exit(0);
+    }
+}
+
+generate();