Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include surrealdb. #426

Merged
merged 9 commits into from
Sep 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/npmpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
image: redis
ports:
- 6379:6379
timeout-minutes: 10
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand All @@ -76,13 +76,15 @@ jobs:
psql -d postgresql://ueberdb:[email protected]/ueberdb -c '\dt'
- name: Create javascript files from typescript
run: npm run build

- run: npm test
env:
SURREALDB_CI: false
- run: npm run lint

publish-npm:
if: github.event_name == 'push'
needs: test
needs:
- test
runs-on: ubuntu-latest
steps:
-
Expand Down
183 changes: 183 additions & 0 deletions databases/surrealdb_db.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
/**
* 2023 Samuel Schwanzer
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS-IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import AbstractDatabase, {Settings} from '../lib/AbstractDatabase';
import Surreal from 'surrealdb.js';
import {BulkObject} from "./cassandra_db";
import {QueryResult} from "surrealdb.js/script/types";

const DATABASE = 'ueberdb';
const STORE_WITH_DOT = 'store:';
const STORE = 'store';

const WILDCARD= '*';
const simpleGlobToRegExp = (s:string) => s.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');

type StoreVal = {
id: string;
key: string;
value: string;
}
export const Database = class SurrealDB extends AbstractDatabase {
private _client: Surreal | null;
constructor(settings:Settings) {
super();
this._client = null;
this.settings = settings || {};
}

get isAsync() { return true; }

async init() {
if (this.settings.url) {
this._client = new Surreal(this.settings.url);
} else if (this.settings.host) {
this._client = new Surreal(this.settings.host);
}
if(this.settings.user && this.settings.password) {
await this._client!.signin({
user: this.settings.user!,
pass: this.settings.password!
})
}
await this._client!.use({ns:DATABASE, db:DATABASE});
}

async get(key:string) {
if (this._client == null) return null;
const res = await this._client.select<StoreVal>(STORE_WITH_DOT+key)
if(res.length>0){
return res[0].value
}
else{
return null;
}
}

async findKeys(key:string, notKey:string) {
if (this._client == null) return null;

if (notKey != null){
const query = `SELECT key FROM store WHERE ${this.transformWildcard(key, 'key')} AND ${this.transformWildcardNegative(notKey, 'notKey')}`
key = key.replace(WILDCARD, '')
notKey = notKey.replace(WILDCARD, '')
console.log("Key ",key, " notKey ", notKey)
const res = await this._client.query<StoreVal[]>(query, {key:key, notKey:notKey})
// @ts-ignore
return this.transformResult(res)
}
else{
const query = `SELECT key FROM store WHERE ${this.transformWildcard(key, 'key')}`
key = key.replace(WILDCARD, '')
const res = await this._client.query<StoreVal[]>(query, {key})
// @ts-ignore
return this.transformResult(res)
}
}

transformWildcard(key: string, keyExpr: string){
if (key.startsWith(WILDCARD) && key.endsWith(WILDCARD)) {
return `${keyExpr} CONTAINS $${keyExpr}`
}
else if (key.startsWith(WILDCARD)) {
return `string::endsWith(${keyExpr}, $${keyExpr})`
}
else if (key.endsWith(WILDCARD)) {
return `string::startsWith(${keyExpr}, $${keyExpr})`
}
else {
return `${keyExpr} = $${keyExpr}`
}
}

transformWildcardNegative(key: string, keyExpr: string){
if (key.startsWith(WILDCARD) && key.endsWith(WILDCARD)) {
return `key CONTAINSNOT $${keyExpr}`
}
else if (key.startsWith(WILDCARD)) {
return `string::endsWith(key, $${keyExpr})==false`
}
else if (key.endsWith(WILDCARD)) {
return `string::startsWith(key, $${keyExpr})==false`
}
else {
return `key != $${keyExpr}`
}
}

transformResult(res: QueryResult<StoreVal[]>[]){
const value: string[] = [];
console.log("Outer result ", res)
res[0].result!.forEach(k=>{
console.log("Resultat ",k)
value.push(k.key);
})
return value
}

/**
* For findKey regex. Used by document dbs like mongodb or dirty.
*/
createFindRegex(key:string, notKey?:string) {
let regex = `^(?=${simpleGlobToRegExp(key)}$)`;
if (notKey != null) regex += `(?!${simpleGlobToRegExp(notKey)}$)`;
return new RegExp(regex);
}

async set(key:string, value:string) {
if (this._client == null) return null;
const exists = await this.get(key)
if(exists){
const updatE = await this._client.update<StoreVal>(STORE, {
id: key,
key: key,
value: value
})
console.log("Update ", updatE)
}
else {
const created = await this._client.create<StoreVal>(STORE, {
id: key,
key:key,
value: value
})
console.log("Created ", created)
}
}

async remove(key:string) {
if (this._client == null) return null
return await this._client.delete<StoreVal>(STORE_WITH_DOT+key)
}

async doBulk(bulk: BulkObject[]) {
if (this._client == null) return null;

bulk.forEach(b=>{
if (b.type === 'set') {
this._client!.update(STORE+b.key, {key: b.key, value: b.value});
} else if (b.type === 'remove') {
this._client!.delete(STORE+b.key);
}
})
}

async close() {
if (this._client == null) return null;
await this._client.close();
this._client = null;
}
};
4 changes: 3 additions & 1 deletion index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import {Database as PostgresPoolDatabase} from './databases/postgrespool_db'
import {Database as RedisDatabase} from './databases/redis_db'
import {Database as RethinkDatabase} from './databases/rethink_db'
import {Database as SQLiteDatabase} from './databases/sqlite_db'

import {Database as Surrealb} from './databases/surrealdb_db'


const cbDb = {
Expand Down Expand Up @@ -138,6 +138,8 @@ export const Database = class {
return new RethinkDatabase(this.dbSettings);
case 'couch':
return new CouchDatabase(this.dbSettings);
case 'surrealdb':
return new Surrealb(this.dbSettings);
default:
throw new Error('Invalid database type');
}
Expand Down
44 changes: 44 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
}
],
"devDependencies": {
"surrealdb.js": "^0.8.4",
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.2.1",
Expand Down
7 changes: 7 additions & 0 deletions test/lib/databases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,11 @@ export const databases:DatabaseType = {
port: '9200',

},
surrealdb: {
url: 'http://127.0.0.1:8000/rpc',
port: 0,
speeds: {
findKeysMax: 30,
},
}
};
Loading
Loading