prostgles-server 4.2.9 → 4.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.9",
+  "version": "4.2.12",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/index.ts

@@ -1,10 +1,10 @@
 import prostgles from "prostgles-client";
 import io from "socket.io-client";
 
-import isomorphic from "../isomorphic_queries";
-import client_only from "../client_only_queries"; 
-import client_rest_api from "../client_rest_api"; 
-import client_files from "../client_files"; 
+import { isomorphicQueries } from "../isomorphicQueries.spec";
+import { clientOnlyQueries } from "../clientOnlyQueries.spec"; 
+import { clientRestApi } from "../clientRestApi.spec"; 
+import { clientFileTests } from "../clientFileTests.spec"; 
 import { InitOptions } from "prostgles-client/dist/prostgles";
 export { DBHandlerClient, Auth } from "prostgles-client/dist/prostgles";
 
@@ -24,19 +24,19 @@ type ClientTestSpec = {
 const tests: Record<string, ClientTestSpec> = {
   main: {
     onRun: async (db, methods, tableSchema, auth) => {
-      await isomorphic(db, log);
-      await client_only(db, auth, log, methods, tableSchema, TEST_NAME);
+      await isomorphicQueries(db, log);
+      await clientOnlyQueries(db, auth, log, methods, tableSchema, TEST_NAME);
     },
   },
   files: {
     onRun: async (db, methods, tableSchema, auth) => {
-      await client_files(db, auth, log, methods, tableSchema)
+      await clientFileTests(db, auth, log, methods, tableSchema)
     },
 
   },
   rest_api: {
     onRun: async (db, methods, tableSchema, auth) => {
-      await client_rest_api(db, auth, log, methods, tableSchema, TEST_NAME);
+      await clientRestApi(db, auth, log, methods, tableSchema, TEST_NAME);
     }
   },
 };

package/tests/client/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "@types/node": "^14.14.16",
+        "@types/node": "^20.9.2",
         "prostgles-client": "^4.0.69",
         "prostgles-types": "^4.0.51",
         "socket.io-client": "^4.7.1"
@@ -24,9 +24,12 @@
       "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
     },
     "node_modules/@types/node": {
-      "version": "14.17.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.18.tgz",
-      "integrity": "sha512-haYyibw4pbteEhkSg0xdDLAI3679L75EJ799ymVrPxOA922bPx3ML59SoDsQ//rHlvqpu+e36kcbR3XRQtFblA=="
+      "version": "20.11.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.5.tgz",
+      "integrity": "sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
     },
     "node_modules/debug": {
       "version": "4.3.4",
@@ -137,6 +140,11 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+    },
     "node_modules/ws": {
       "version": "8.11.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
@@ -173,9 +181,12 @@
       "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
     },
     "@types/node": {
-      "version": "14.17.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.18.tgz",
-      "integrity": "sha512-haYyibw4pbteEhkSg0xdDLAI3679L75EJ799ymVrPxOA922bPx3ML59SoDsQ//rHlvqpu+e36kcbR3XRQtFblA=="
+      "version": "20.11.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.5.tgz",
+      "integrity": "sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==",
+      "requires": {
+        "undici-types": "~5.26.4"
+      }
     },
     "debug": {
       "version": "4.3.4",
@@ -254,6 +265,11 @@
       "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
       "dev": true
     },
+    "undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+    },
     "ws": {
       "version": "8.11.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",

package/tests/client/package.json

@@ -7,12 +7,12 @@
     "start": "tsc-watch --onSuccess \"node dist/client/index.js\"",
     "dev": "NOSTOP=true npm start",
     "build": "rm -rf ./node_modules/* && rm -rf ./dist/* && npm i && tsc",
-    "test": "node  dist/client/index.js"
+    "test": "node --test --experimental-test-coverage dist/client/index.js"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@types/node": "^14.14.16",
+    "@types/node": "^20.9.2",
     "prostgles-client": "^4.0.69",
     "prostgles-types": "^4.0.51",
     "socket.io-client": "^4.7.1"

package/tests/clientFileTests.spec.ts

@@ -0,0 +1,103 @@
+
+import { DBSchemaTable } from "prostgles-types";
+import type { Auth, DBHandlerClient } from "./client/index";
+import { tryRun } from './isomorphicQueries.spec';
+import { strict as assert } from 'assert';
+import fs from "fs";
+import { describe, test } from "node:test";
+
+export const clientFileTests = async (db: DBHandlerClient, auth: Auth, log: (...args: any[]) => any, methods, tableSchema: DBSchemaTable[]) => {
+   
+  await describe("clientFileTests", async () => {
+      
+    const fileFolder = `${__dirname}/../../server/dist/server/media/`;
+    const getFiles = () => db.sql("SELECT id, original_name FROM files", { }, { returnType: "rows" })
+    await db.sql(`
+      ALTER TABLE users_public_info 
+      DROP CONSTRAINT "users_public_info_avatar_fkey";
+
+      ALTER TABLE "users_public_info"
+      ADD FOREIGN KEY ("avatar")
+      REFERENCES "files" ("id")
+      ON DELETE SET NULL
+    `, { })
+    const initialFiles = await getFiles();
+
+    await test("Files table is present", async () => {
+      const files = await db.files.find!();
+      assert.deepStrictEqual(files, []); 
+    });
+
+
+    const file = { 
+      data: Buffer.from("This is a string", "utf-8"), 
+      name: "sample_file.txt" 
+    };
+    let insertedFile;
+    await test("Insert file from nested insert", async () => {
+      const nestedInsert = await db.users_public_info.insert!({ name: "somename.txt", avatar: file }, { returning: "*" });
+      const files = await db.files.find!();
+      assert.equal(files.length, 1);
+      assert.equal(files[0].id, nestedInsert.avatar.id);
+      assert.equal(files[0].original_name, file.name);
+      const initialFileStr = fs.readFileSync(fileFolder + files[0].name).toString('utf8');
+      assert.equal(file.data.toString(), initialFileStr);
+      insertedFile = files[0]
+    });
+
+    await test("Cannot Insert file directly", async () => {
+      try {
+        await db.files.insert!(file, { returning: "*" });
+        throw "Should not be able to insert files directly"
+      } catch (err){
+        assert.equal(err.message.startsWith("Direct inserts not allowed"), true);
+      }
+    });
+
+    await test("Can update allowed files directly", async () => {
+      const newData =  { 
+        data: Buffer.from("aa", "utf-8"), 
+        name: "a.txt" 
+      }
+      await db.files.update!({ id: insertedFile.id }, newData);
+      const newFiles = await db.files.find!();
+      assert.equal(newFiles.length, 1);
+      const [newFile] = newFiles;
+      assert.equal(newFile?.original_name, newData.name);
+      assert.equal(newFile.id, insertedFile.id);
+      assert.equal(
+        fs.readFileSync(fileFolder + newFile.name).toString('utf8').toString(),
+        newData.data.toString()
+      );
+    });
+
+    await test("Can insert allowed files through a nested update", async () => {
+
+      await db.files.delete!();
+      const user = await db.users_public_info.findOne!();
+      const newData =  { 
+        data: Buffer.from("nestedupdate", "utf-8"), 
+        name: "nestedupdate.txt" 
+      }
+      const d = await db.users_public_info.update!({ id: user?.id }, { avatar: newData }, { returning: "*" });
+      const avatarFile = await db.files.findOne!({ id: d?.at(0).avatar.id });
+      const initialFileStr = fs.readFileSync(fileFolder + avatarFile!.name).toString('utf8');
+      assert.equal(newData.data.toString(), initialFileStr);
+    });
+
+    await test("Can delete only allowed files directly", async () => {
+      const users = await db.users_public_info.find!();
+      for await(const user of users){
+        await db.files.delete!({ id: user.avatar.id });
+        await db.users_public_info.delete!({ id: user.id });
+      }
+
+      await db.users_public_info.delete!();
+      const files = await db.files.find!();
+      assert.deepStrictEqual(files, []);
+      const latestFiles = await getFiles() 
+      assert.equal(initialFiles.length, latestFiles.length);
+    });
+
+  });
+}