Merge pull request #7 from JSON-ms/dev

merge dev into master

Author: dannycoulombe

composer.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.9",
+  "version": "1.0.13",
   "name": "jsonms/php",
   "description": "A JSON.ms requests handler to install on your own server.",
   "type": "library",

src/Controllers/DataController.php

@@ -3,6 +3,7 @@
 namespace JSONms\Controllers;
 
 use JSONms\Utils\ErrorHandler;
+use JSONms\Utils\Composer;
 
 class DataController extends BaseController {
 
@@ -26,14 +27,14 @@ public function getAction(string $hash): void {
                 "uploadMaxSize" => ini_get('upload_max_filesize'),
                 "postMaxSize" => ini_get('post_max_size'),
                 'publicUrl' => $this->publicUrl,
-                'version' => 1,
-                'features' => [
+                'version' => Composer::getVersion(),
+                'supportedFeatures' => [
                     'data/get',
                     'data/update',
-                    'data/history',
-                    'file/index',
+                    'file/list',
                     'file/read',
                     'file/upload',
+                    'file/delete',
                 ],
             ],
         ]);

src/Controllers/FileController.php

@@ -95,6 +95,7 @@ public function uploadAction(string $hash) {
                 $meta = [
                     'size' => $fileSize,
                     'type' => $fileType,
+                    'timestamp' => time(),
                     'originalFileName' => $fileName,
                 ];
 
@@ -139,7 +140,6 @@ public function uploadAction(string $hash) {
                 });
                 file_put_contents($fileListPath, json_encode(array_values($fileList)));
 
-
                 // Return response
                 http_response_code(200);
                 echo json_encode([

src/Controllers/TestController.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace JSONms\Controllers;
+
+class TestController extends BaseController {
+
+    public function tryAction(): void {
+        http_response_code(200);
+        echo json_encode(true);
+        exit;
+    }
+}

src/Utils/Composer.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace JSONms\Utils;
+
+class Composer {
+
+    public static function getVersion() {
+
+        $ds = DIRECTORY_SEPARATOR;
+        $filePath = realpath(dirname(__FILE__) . $ds . '..' . $ds . '..' . $ds . 'composer.json');
+
+        if (!file_exists($filePath)) {
+            return null;
+        }
+
+        $jsonContent = file_get_contents($filePath);
+        $composerData = json_decode($jsonContent, true);
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            throw new Exception("Error decoding JSON: " . json_last_error_msg());
+        }
+
+        return isset($composerData['version']) ? $composerData['version'] : null;
+    }
+}

src/Utils/ErrorHandler.php

@@ -5,7 +5,7 @@
 class ErrorHandler {
 
     public static function throwError($code, $body) {
-        http_response_code($code || 500);
+        http_response_code($code ?? 500);
         echo json_encode(['body' => $body]);
         exit;
     }