From 97497dc642b672853af6f7d5afddcee7e9a2582e Mon Sep 17 00:00:00 2001
From: srgooglo <srgooglo@ragestudio.net>
Date: Fri, 18 Feb 2022 13:25:43 +0100
Subject: [PATCH] fix globals

---
 package.json        |  7 ++++---
 src/server/index.js | 18 +++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 6247779..fc2d551 100755
--- a/package.json
+++ b/package.json
@@ -3,17 +3,18 @@
   "version": "0.10.0",
   "description": "A simple, fast, and powerful REST API interface library",
   "author": "RageStudio",
-  "main": "dist/index.js",
+  "main": "./dist/client/index.js",
   "scripts": {
     "start": "corenode-node ./src/bin/server.js",
-    "build": "corenode-cli build --parallel --clean --fix && chmod -R 777 ./dist",
+    "build": "corenode-cli build --parallel --clean && chmod -R 777 ./dist",
     "test": "mocha"
   },
   "publishConfig": {
     "access": "public"
   },
   "files": [
-    "**/**"
+    "dist/**/**",
+    "./package.json"
   ],
   "license": "MIT",
   "dependencies": {
diff --git a/src/server/index.js b/src/server/index.js
index 579748c..8a983f5 100755
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -1,19 +1,19 @@
-const fs = require("fs")
 const path = require("path")
-const packageJSON = require(path.resolve(process.cwd(), "package.json"))
-
+const fs = require("fs")
 const http = require("nanoexpress")
 const net = require("corenode/net")
 
+const packageJSON = require(path.resolve(module.path, "../../package.json"))
+global.LINEBRIDGE_SERVER_VERSION = packageJSON.version
+
 const tokenizer = require("corenode/libs/tokenizer")
 const { randomWord } = require("@corenode/utils")
 
 const { serverManifest } = require("../lib")
 
-const SERVER_VERSION = global.SERVER_VERSION = packageJSON.version
-const LOCALHOST_ADDRESS = global.LOCALHOST_ADDRESS = net.ip.getHostAddress() ?? "localhost"
-const VALID_HTTP_METHODS = global.VALID_HTTP_METHODS = ["get", "post", "put", "patch", "del", "trace", "head", "any", "options", "ws"]
-const DEFAULT_HEADERS = global.DEFAULT_HEADERS = {
+global.LOCALHOST_ADDRESS = net.ip.getHostAddress() ?? "localhost"
+global.VALID_HTTP_METHODS = ["get", "post", "put", "patch", "del", "trace", "head", "any", "options", "ws"]
+global.DEFAULT_HEADERS = {
     "Access-Control-Allow-Headers": "Origin, X-Requested-With, Content-Type, Accept, Authorization",
     "Access-Control-Allow-Origin": "*",
     "Access-Control-Allow-Methods": "GET, POST, OPTIONS, PUT, PATCH, DELETE, DEL",
@@ -191,11 +191,11 @@ class Server {
             route: "/",
             fn: (req, res) => {
                 return res.json({
+                    LINEBRIDGE_SERVER_VERSION: LINEBRIDGE_SERVER_VERSION,
                     id: this.id,
                     usid: this.usid,
                     oskid: this.oskid,
-                    time: new Date().getTime(),
-                    version: SERVER_VERSION,
+                    requestTime: new Date().getTime(),
                     endpointsMap: this.endpointsMap,
                 })
             }