prostgles-server 2.0.200 → 2.0.203

package/lib/PubSubManager.ts

@@ -90,8 +90,8 @@ type AddSubscriptionParams = SubscriptionParams & {
 
 export type PubSubManagerOptions = {
   dboBuilder: DboBuilder;
-  db: DB;
-  dbo: DBHandlerServer;
+  // db: DB;
+  // dbo: DBHandlerServer;
   wsChannelNamePrefix?: string;
   pgChannelName?: string;
   onSchemaChange?: (event: { command: string; query: string }) => void;
@@ -101,8 +101,13 @@ export class PubSubManager {
   static DELIMITER = '|$prstgls$|';
 
   dboBuilder: DboBuilder;
-  db: DB;
-  dbo: DBHandlerServer;
+  get db(): DB  {
+    return this.dboBuilder.db;
+  }
+  get dbo(): DBHandlerServer  {
+    return this.dboBuilder.dbo;
+  }
+  
   _triggers?: Record<string, string[]>;
   sockets: any;
   subs: { [ke: string]: { [ke: string]: { subs: SubscriptionParams[] } } };
@@ -113,12 +118,11 @@ export class PubSubManager {
   postgresNotifListenManager?: PostgresNotifListenManager;
 
   private constructor(options: PubSubManagerOptions) {
-    const { db, dbo, wsChannelNamePrefix, pgChannelName, onSchemaChange, dboBuilder } = options;
-    if (!db || !dbo) {
+    const { wsChannelNamePrefix, pgChannelName, onSchemaChange, dboBuilder } = options;
+    if (!dboBuilder.db || !dboBuilder.dbo) {
       throw 'MISSING: db_pg, db';
     }
-    this.db = db;
-    this.dbo = dbo;
+    
     this.onSchemaChange = onSchemaChange;
     this.dboBuilder = dboBuilder;
 
@@ -1117,7 +1121,9 @@ export class PubSubManager {
     return new Promise(async (resolve, reject) => {
       /* TODO: Retire subOne -> it's redundant */
       // this.dbo[table_name][subOne? "findOne" : "find"](filter, params, null, table_rules)
-      if (!this.dbo?.[table_name]?.find) throw "1107 this.dbo[table_name].find";
+      if (!this.dbo?.[table_name]?.find) {
+        throw new Error(`1107 this.dbo.${table_name}.find`);
+      }
 
       this.dbo?.[table_name]?.find?.(filter, params, undefined, table_rules)
         .then(data => {
@@ -1128,7 +1134,7 @@ export class PubSubManager {
               resolve(data);
             });
             /* TO DO: confirm receiving data or server will unsubscribe
-                    { data }, (cb)=> { console.log(cb) });
+              { data }, (cb)=> { console.log(cb) });
             */
           } else if (func) {
             func(data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.200",
+  "version": "2.0.203",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "bluebird": "^3.7.2",
     "file-type": "^17.1.2",
     "pg-promise": "^10.11.1",
-    "prostgles-types": "^1.5.163",
+    "prostgles-types": "^1.5.165",
     "sharp": "^0.30.7"
   },
   "devDependencies": {

package/tests/client/PID.txt

@@ -1 +1 @@
-14222
+66713

package/tests/isomorphic_queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isomorphic_queries.d.ts","sourceRoot":"","sources":["isomorphic_queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGtD,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,iBAYzE;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,oBAW7F;AAED,wBAA8B,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,iBA2vB/F"}
+{"version":3,"file":"isomorphic_queries.d.ts","sourceRoot":"","sources":["isomorphic_queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGtD,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,iBAYzE;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,oBAW7F;AAED,wBAA8B,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,iBAgyB/F"}

package/tests/isomorphic_queries.js

@@ -510,7 +510,39 @@ async function isomorphic(db) {
         // });
     });
     await tryRun("Local file delete", async () => {
-        const file = await db.media.delete({ name: fileName }, { returning: "*" });
+        const file = {
+            data: Buffer.from("str", "utf-8"),
+            name: "will delete.txt"
+        };
+        await db.media.insert(file);
+        const files = await db.media.find({ original_name: file.name });
+        assert_1.strict.equal(files.length, 1);
+        const exists0 = fs.existsSync(__dirname + "/server/media/" + files[0].name);
+        assert_1.strict.equal(exists0, true);
+        await db.media.delete({ original_name: file.name }, { returning: "*" });
+        const exists = fs.existsSync(__dirname + "/server/media/" + files[0].name);
+        assert_1.strict.equal(exists, false);
+    });
+    await tryRun("Local file update", async () => {
+        const initialStr = "str";
+        const newStr = "str new";
+        const file = {
+            data: Buffer.from(initialStr, "utf-8"),
+            name: "will update.txt"
+        };
+        const newFile = {
+            data: Buffer.from(newStr, "utf-8"),
+            name: "will update new.txt"
+        };
+        await db.media.insert(file);
+        const original = await db.media.findOne({ original_name: file.name });
+        const initialFileStr = fs.readFileSync(__dirname + "/server/media/" + original.name).toString('utf8');
+        assert_1.strict.equal(initialStr, initialFileStr);
+        await db.media.update({ id: original.id }, newFile);
+        const newFileStr = fs.readFileSync(__dirname + "/server/media/" + original.name).toString('utf8');
+        assert_1.strict.equal(newStr, newFileStr);
+        const newF = await db.media.findOne({ id: original.id });
+        assert_1.strict.equal(newF.original_name, newFile.name);
     });
     await tryRun("Exists filter example", async () => {
         const fo = await db.items.findOne(), f = await db.items.find();

package/tests/isomorphic_queries.ts

@@ -581,12 +581,49 @@ export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<
     // });
   });
 
-  await tryRun("Local file delete", async () => {
 
-    const file = await db.media.delete({ name: fileName }, { returning: "*" });
+  await tryRun("Local file delete", async () => {
+    const file = { 
+      data: Buffer.from("str", "utf-8"), 
+      name: "will delete.txt" 
+    }
+    await db.media.insert(file);
     
+    const files = await db.media.find({ original_name: file.name });
+    assert.equal(files.length, 1);
+    const exists0 = fs.existsSync(__dirname + "/server/media/"+files[0].name);
+    assert.equal(exists0, true);
+    await db.media.delete({ original_name: file.name }, { returning: "*" });
+    const exists = fs.existsSync(__dirname + "/server/media/"+files[0].name);
+    assert.equal(exists, false);
   })
 
+  await tryRun("Local file update", async () => {
+    const initialStr = "str";
+    const newStr = "str new";
+    const file = { 
+      data: Buffer.from(initialStr, "utf-8"), 
+      name: "will update.txt" 
+    }
+    const newFile = { 
+      data: Buffer.from(newStr, "utf-8"), 
+      name: "will update new.txt" 
+    }
+    await db.media.insert(file);
+    const original = await db.media.findOne({ original_name: file.name });
+    
+    const initialFileStr = fs.readFileSync(__dirname + "/server/media/" + original.name).toString('utf8');
+    assert.equal(initialStr, initialFileStr);
+
+    await db.media.update({ id: original.id }, newFile);
+    
+    const newFileStr = fs.readFileSync(__dirname + "/server/media/" + original.name).toString('utf8');
+    assert.equal(newStr, newFileStr);
+    
+    const newF = await db.media.findOne({ id: original.id });
+
+    assert.equal(newF.original_name, newFile.name)
+  })
   
   await tryRun("Exists filter example", async () => {
   

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.199",
+      "version": "2.0.202",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.121.0",
@@ -29,7 +29,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^17.1.2",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.163",
+        "prostgles-types": "^1.5.165",
         "sharp": "^0.30.7"
       },
       "devDependencies": {
@@ -1371,7 +1371,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^17.1.2",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.163",
+        "prostgles-types": "^1.5.165",
         "sharp": "^0.30.7",
         "typescript": "^4.7.4"
       }