puvox-library 1.0.6 → 1.0.8

package/library_standard.js

@@ -2636,17 +2636,8 @@ const puvox_library =
 
 
 
-	// for node packs:
-	_fs_instance :null,
-	fs(){
-		if (this._fs_instance){
-			return this._fs_instance;
-		} 
-		else {
-			let name='fs';
-			this._fs_instance = require(name);
-			return this._fs_instance;
-		}
+	async fetch(url, postOptions = null, opts = {}){
+		return await this.getRemoteData(url, postOptions, opts);
 	},
 	async getRemoteData(url, postOptions = null, opts = {}){
 		// https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch
@@ -2657,7 +2648,8 @@ const puvox_library =
 		}
 		options['headers'] = ('headers' in opts) ? opts.headers : {'Content-Type': 'application/json'};
 		const fetched = await fetch(url, options);
-		return await (fetched).text();
+		const text = (await (fetched).text());
+		return text;
 		// return new Promise ((resolve, reject) => {
 		// 	try {
 		// 		// const https = require('https');
@@ -2666,147 +2658,221 @@ const puvox_library =
 		// 	} catch (ex) { reject (ex); }
 		// });
 	},
-    writeFileAppendJson(filePath, jsonContent, callback){
-        try{
-            var callback = callback || function(){};
-			var self = this;
-            this.fs().readFile(filePath, 'utf8', function(err,data) {
-                let json = {};
-                if (typeof data !="undefined" && data!=''){
-                    json=JSON.parse(data);
-				}
-                let jsonNew = self.jsonConcat(json, jsonContent);
-                let content = JSON.stringify(jsonNew);
-                self.fs().writeFile(filePath, content, 'utf8', function(callback_) {
-                }); 
-            });
-        }
-        catch(e){
-            console.log("writeFileAppendJson", e); 
-        }
-    },
-	getFilesListFromDir (dir) {
-		const filesList = [];
-		this.fs().readdirSync(dir, (err, files) => {
-			files.forEach(file => {
-				filesList.push(file);
-			});
-		});
-		return filesList;
-	},
+
+	
 	//  if(setHashInAddress) {	window.location.hash = id_or_Name;	}
 	
 
 	
 
 	// ######## CACHE ITEMS (client-side JS) ########
-	cacheStorageGet(itemName, defaultValue){
-		let curr= window.localStorage.getItem('puvox_'+itemName);
-		return (curr==null ? defaultValue : curr);
-	},
-	cacheStorageGetItem(arrayName, itemName, defaultValue){
-		let curr = this.cacheStorageGet(arrayName, '{}' );
-		let parsed = JSON.parse(curr);
-		return (itemName in parsed ? parsed.itemName : defaultValue);
-	},
-	cacheStorageSet(itemName, value){
-		try{ window.localStorage.setItem('puvox_'+itemName, value); return true; }
-		catch(ex){ alert("Cache storage quote exceeded. can't save value. err598"); return false; }
-	},
-	cacheSetItem(arrayName, itemName, value){ 
-		let curr = this.cacheGet(arrayName, '{}' );
-		let parsed = JSON.parse(curr);
-		parsed.itemName =defaultValue;
-		return this.cacheSet( arrayName, JSON.stringify(parsed) );
-	},
-	// ################################################
-
-
-	createDirIfNotExists(dirPath){
-		if (!this.fs().existsSync(dirPath)){
-			this.fs().mkdirSync(dirPath);
-		}
-	},
-	fileExists(filePath){
-		return this.fs().existsSync(filePath);
-	},
-	filemtime(filePath){
-		return (this.fs().statSync(filePath)).mtime;
-	},
-	unlink(filePath){
-		return (this.fs().unlinkSync(filePath));
-	},
-	fileGetContents(filePath, defaultt = ''){
-		if (!this.fileExists(filePath)){
-			return defaultt;
-		}
-		return (this.fs().readFileSync(filePath));
-	},
-	saveFile(filePath, content){ this.fs().writeFileSync(filePath,content, 'utf8', function(err){
-			if (err) throw err;
-		});
-	},
-
-
-	
-	// ########## CACHE DIRS (server-side JS) ##########
-	getDirTempOS(){ let name='os'; return require(name).tmpdir(); },
-	customCacheDir:null,
-	cacheDirGet(appName){  
-		if (!this.customCacheDir){ 
-			this.customCacheDir = this.getDirTempOS() + '/_cache_dir_px/';
-		}
-		let finaldir = this.customCacheDir + appName + '/';
-		this.createDirIfNotExists(finaldir);
-		return finaldir; 
-	},
-	cacheFileLocation(uniqFileName){
-		uniqFileName = this.isString(uniqFileName) || this.isNumeric(uniqFileName) ? uniqFileName : JSON.stringify(uniqFileName);
-		uniqFileName = this.sanitize_key_dashed(this.getCharsFromStart(uniqFileName, 15)) + "_"+ this.md5($uniqFileName);
-		filePath= this.cacheDirGet() + uniqFileName + "_tmp"; //"/". 
-		return filePath;
-	},
-	//
-	cacheGetFile(uniqFileName, defaultt ='', expire_seconds=8640000, decode = true)
-	{
-		let filePath = this.cacheFileLocation(uniqFileName);
-		if ( filePath.length < 3) return "too tiny filename";
-
-		if ( this.fileExists(filePath) ){
-			if (this.filemtime(filePath)+expire_seconds<time() ){
-				this.unlink(filePath);
-				return defaultt;
+	AppName : 'puvox_', //override with anything you want
+	setAppName (name){ this.AppName = name; },
+
+	cache : {
+		localStorage : {
+			parent(){ return puvox_library; },
+			AppName(){ return puvox_library.AppName; },
+
+			storage: typeof window !== 'undefined' ? window.localStorage : null,
+
+			get(name, defaultValue, expireSeconds = 0){
+				let appName = this.AppName();
+				let val = this.storage.getItem(appName + '_' + name);
+				let expireVal = this.storage.getItem(appName + '_createtime_' + name);
+				if (val === null) {
+					return defaultValue;
+				} else {
+					if (expireSeconds === 0){
+						return val;
+					} else {
+						let now = (new Date()).getTime();
+						if (now - expireVal > expireSeconds*1000){
+							this.storage.removeItem(appName + '_' + name);
+							this.storage.removeItem(appName + '_createtime_' + name);
+							return defaultValue;
+						}
+					}
+				}
+			},
+			set(name, value){
+				try{ 
+					this.storage.setItem(this.AppName() + '_' +name, value); 
+					this.storage.setItem(this.AppName() + '_createtime_' +name, (new Date()).getTime()); 
+					return true; 
+				}
+				catch(ex){ alert("Cache storage quote exceeded. can't save value. err598"); return false; }
+			},
+			remove(name, value){
+				this.storage.removeItem(this.AppName() + '_' +name); 
+				this.storage.removeItem(this.AppName() + '_createtime_' +name);
+			},
+			getItem(name, subItemName, defaultValue){
+				let val = this.get(name, '{}');
+				let parsed = JSON.parse(val);
+				return (subItemName in parsed ? parsed[subItemName] : defaultValue);
+			},
+			setItem(name, subItemName, value){ 
+				let curr = this.get(name, '{}' );
+				let parsed = JSON.parse(curr);
+				parsed[subItemName] = value;
+				return this.set(name, JSON.stringify(parsed) );
+			},
+			removeItem(name, subItemName, value){ 
+				let curr = this.get(name, '{}' );
+				let parsed = JSON.parse(curr);
+				if (subItemName in parsed)
+					delete parsed[subItemName];
+				return this.set(name, JSON.stringify(parsed) );
 			}
-			else{	
-				cont = this.fileGetContents(filePath, null);
-				// if specifically array, then on empty, reckon as array
-				if (cont===null)
-				{
-					return defaultt;
+		},
+		file : {
+			// ########## CACHE DIRS (server-side JS) ##########
+			parent(){ return puvox_library; },
+			AppName(){ return puvox_library.AppName; },
+
+			customCacheDir:null,
+			dirPath(){  
+				if (!this.customCacheDir){ 
+					this.customCacheDir = this.parent().file.getTempDir() + '/';
 				}
-				if (decode){
-					try{
-						return JSON.parse(cont);
+				let finaldir = this.customCacheDir + '_cache' + this.AppName() + '/';
+				return finaldir; 
+			},
+			filePath(uniqFileName){
+				const parent = this.parent();
+				uniqFileName = parent.isString(uniqFileName) || parent.isNumeric(uniqFileName) ? uniqFileName : JSON.stringify(uniqFileName);
+				uniqFileName = parent.sanitize_key_dashed(parent.getCharsFromStart(uniqFileName, 15)) + "_"+ parent.md5(uniqFileName);
+				filePath= this.dirPath() + uniqFileName + "_tmp"; //"/". 
+				return filePath;
+			},
+			//
+			get(uniqFileName, defaultContent ='', expire_seconds=8640000, decode = true)
+			{
+				const parent = this.parent();
+				let filePath = this.filePath(uniqFileName);
+				if ( filePath.length < 3) return "too tiny filename";
+
+				if ( parent.file.exists(filePath) ){
+					if ( parent.file.mtime(filePath) + expire_seconds *1000 < (new Date()).getTime() ){
+						parent.file.unlink(filePath);
+						return defaultContent;
 					}
-					catch(ex){
-						return cont;
+					else{	
+						cont = parent.file.read(filePath, null);
+						// if specifically array, then on empty, reckon as array
+						if (cont===null)
+						{
+							return defaultContent;
+						}
+						if (decode){
+							try{
+								return JSON.parse(cont);
+							}
+							catch(ex){
+								return cont;
+							}
+						}
+						else{
+							return cont;
+						}
 					}
 				}
-				else{
-					return cont;
+				else {
+					return defaultContent;
 				}
-			}
+			},
+			set(uniqFileName, content)
+			{
+				const parent = this.parent();
+				let filePath= this.filePath(uniqFileName);
+				let contentFinal = parent.isString(content) ? content : ((parent.isArray(content) || parent.isObject(content)) ? JSON.stringify(content) : content);
+				return parent.file.write(filePath, contentFinal);
+			},
+			
+			//
+			// writeFileAppendJson(filePath, jsonContent, callback){
+			// 	try{
+			// 		var callback = callback || function(){};
+			// 		var self = this;
+			// 		puvox_library.modules('fs').readFile(filePath, 'utf8', function(err,data) {
+			// 			let json = {};
+			// 			if (typeof data !="undefined" && data!=''){
+			// 				json=JSON.parse(data);
+			// 			}
+			// 			let jsonNew = self.jsonConcat(json, jsonContent);
+			// 			let content = JSON.stringify(jsonNew);
+			// 			puvox_library.modules('fs').writeFile(filePath, content, 'utf8', function(callback_) {
+			// 			}); 
+			// 		});
+			// 	}
+			// 	catch(e){
+			// 		console.log("writeFileAppendJson", e); 
+			// 	}
+			// },
 		}
-		else {
-			return defaultt;
+	}, 
+
+	// ################################################
+	// for node packs:_fs_instance :null,
+	_required_instances : {},
+	modules(name){
+		if (name in this._required_instances){
+			return this._required_instances[name];
+		} else {
+			this._required_instances[name] = require(name);
+			return this._required_instances[name];
 		}
+	}, 
+	file : {
+		parent() {return puvox_library;},
+		fs() {return puvox_library.modules('fs');},
+		os() {return puvox_library.modules('os');},
+		path() {return puvox_library.modules('path');},
+		//
+		getTempDir(){ return this.os().tmpdir(); },
+
+		exists(filePath){
+			return this.fs().existsSync(filePath);
+		},
+		mtime(filePath){
+			if (this.exists(filePath)) {
+				return (this.fs().statSync(filePath)).mtimeMs;
+			} else {
+				return null;
+			}
+		},
+		unlink(filePath){
+			return (this.fs().unlinkSync(filePath));
+		},
+		createDirectory(dirPath, force = false){
+			if (!this.exists(dirPath) || force){
+				this.fs().mkdirSync(dirPath, { recursive: true });
+			}
+		},
+		read(filePath, defaultContent = ''){
+			if (!this.exists(filePath)){
+				return defaultContent;
+			}
+			return this.fs().readFileSync(filePath);
+		},
+		write(filePath, content){
+			const dir = this.path().dirname(filePath);
+			this.createDirectory(dir);
+			this.fs().writeFileSync(filePath, content, 'utf8', function(err){
+				if (err) throw err;
+			});
+		},
+		getFilesListFromDir (dir) {
+			const filesList = [];
+			this.fs().readdirSync(dir, (err, files) => {
+				files.forEach(file => {
+					filesList.push(file);
+				});
+			});
+			return filesList;
+		},
 	},
-	cacheSetFile(uniqFileName, content, encode=true)
-	{
-		let filePath= this.cacheFileLocation(uniqFileName);
-		let contentFinal = (encode && (this.isArray(content) || this.isObject(content)) ) ? JSON.stringify($content): content;
-		return this.saveFile(filePath, contentFinal);
-	} 
 };
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "puvox-library",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "library-class-javascript",
   "main": "library_standard.js",
   "scripts": {