@live-change/db-server 0.9.98 → 0.9.100

package/Dockerfile

@@ -11,13 +11,16 @@ RUN npm install -g node-lmdb
 RUN npm install -g subleveldown
 RUN npm install -g typescript
 
-RUN npm install -g @live-change/db-client@`echo "console.log(require('./package.json').version)" | node`
+ARG VERSION=`echo "console.log(require('./package.json').version)" | node`
+
+RUN npm install -g @live-change/db-client@$VERSION
 
 # APP
 RUN mkdir -p /app
 WORKDIR /app
 COPY package.json package.json
-RUN --mount=type=secret,id=npmrc,target=/root/.npmrc yarn install --verbose --network-timeout 36000000
+#RUN --mount=type=secret,id=npmrc,target=/root/.npmrc yarn install --verbose --network-timeout 36000000
+RUN --mount=type=cache,id=npmrc,target=/app/node_modules; yarn install --frozen-lockfil --verbose --network-timeout 36000000
 RUN cd node_modules/@live-change/db-admin/; npm run build
 COPY /bin bin
 COPY /lib lib

package/build-docker-and-upload.sh

@@ -1,10 +1,14 @@
 #!/bin/bash
 VERSION=`echo "console.log(require('./package.json').version)" | node`
 PLATFORMS="linux/amd64,linux/arm64,linux/arm/v7"
+export BUILDKIT_PROGRESS=plain
+export DOCKER_BUILDKIT=1 
 #PLATFORMS="linux/amd64"
 echo building docker image for version $VERSION
-docker buildx use hybrid-builde
+docker buildx use hybrid-builder
 docker buildx build --debug \
+  --builder hybrid-builder \
+  --build-arg VERSION=$VERSION \
   --platform $PLATFORMS \
   -t livechange/db-server:$VERSION \
   -t livechange/db-server:latest \

package/lib/dbDao.js

@@ -227,13 +227,13 @@ function localRequests(server, scriptContext) {
       if(!log) throw new Error("logNotFound")
       return log.putOld(object)
     },
-    clearLog: (dbName, logName, before) => {
+    clearLog: (dbName, logName, before, maxCount) => {
       if(dbName === 'system') throw new Error("system database is not writable")
       const db = server.databases.get(dbName)
       if(!db) throw new Error('databaseNotFound '+dbName)
       const log = db.log(logName)
       if(!log) throw new Error("logNotFound")
-      return log.clear(before)
+      return log.clear(before, maxCount || Infinity)
     },
     query: (dbName, code, params) => {
       if(dbName === 'system') throw new Error("system database is not writable")
@@ -365,13 +365,13 @@ function remoteRequests(server) {
       if(!log) throw new Error("logNotFound")
       return server.masterDao.request(['database', 'putOldLog'], dbName, logName, object )
     },
-    clearLog: (dbName, logName, before) => {
+    clearLog: (dbName, logName, before, maxCount) => {
       if(dbName === 'system') throw new Error("system database is not writable")
       const db = server.databases.get(dbName)
       if(!db) throw new Error('databaseNotFound')
       const log = db.log(logName)
       if(!log) throw new Error("logNotFound")
-      return server.masterDao.request(['database', 'clearLog'], dbName, logName, before )
+      return server.masterDao.request(['database', 'clearLog'], dbName, logName, before, maxCount)
     },
     query: (dbName, code, params) => {
       if(!dbName) throw new Error("databaseNameRequired")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db-server",
-  "version": "0.9.98",
+  "version": "0.9.100",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -32,18 +32,18 @@
     "tape": "^5.7.4"
   },
   "dependencies": {
-    "@live-change/dao": "^0.9.98",
-    "@live-change/dao-message": "^0.9.98",
-    "@live-change/dao-sockjs": "^0.9.98",
-    "@live-change/dao-websocket": "^0.9.98",
-    "@live-change/db": "^0.9.98",
-    "@live-change/db-admin": "^0.9.98",
-    "@live-change/db-client": "^0.9.98",
-    "@live-change/db-store-level": "^0.9.98",
-    "@live-change/db-store-lmdb": "^0.9.98",
-    "@live-change/db-store-observable-db": "^0.9.98",
-    "@live-change/db-store-rbtree": "^0.9.98",
-    "@live-change/server": "^0.9.98",
+    "@live-change/dao": "^0.9.100",
+    "@live-change/dao-message": "^0.9.100",
+    "@live-change/dao-sockjs": "^0.9.100",
+    "@live-change/dao-websocket": "^0.9.100",
+    "@live-change/db": "^0.9.100",
+    "@live-change/db-admin": "^0.9.100",
+    "@live-change/db-client": "^0.9.100",
+    "@live-change/db-store-level": "^0.9.100",
+    "@live-change/db-store-lmdb": "^0.9.100",
+    "@live-change/db-store-observable-db": "^0.9.100",
+    "@live-change/db-store-rbtree": "^0.9.100",
+    "@live-change/server": "^0.9.100",
     "@live-change/sockjs": "0.4.1",
     "@tailwindcss/vite": "^4.1.0",
     "express": "^4.18.2",
@@ -53,5 +53,5 @@
     "websocket": "^1.0.34",
     "yargs": "^17.7.2"
   },
-  "gitHead": "a0e25c0ac835707d27763e56a2c20bd75d978583"
+  "gitHead": "4e7ef4d160d217e1d82b8dc5fdf542a65f8a1834"
 }

package/prepare-builder.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+docker buildx rm hybrid-builder 
+docker builder prune -a
+sudo systemctl restart docker
+docker buildx create --name hybrid-builder --platform linux/amd64 --use
+docker buildx create --name hybrid-builder \
+  --append \
+  --node armremote \
+  --platform linux/arm64,linux/arm \
+  tcp://100.64.0.2:2375
+docker buildx use hybrid-builder
+docker buildx ls
+