瀏覽代碼

Database, eventbus, pluginloader fixes

master
peter 6 年之前
父節點
當前提交
874d9ebbfc
共有 11 個文件被更改,包括 100 次插入13 次删除
  1. 83
    0
      .drone.yml
  2. 1
    1
      Dockerfile
  3. 6
    0
      LICENSE.md
  4. 3
    3
      package-lock.json
  5. 1
    1
      package.json
  6. 1
    1
      src/backend/Admin.ts
  7. 1
    2
      src/backend/Eventbus.ts
  8. 1
    1
      src/backend/Installer.ts
  9. 1
    2
      src/backend/Plugin.ts
  10. 1
    1
      src/backend/PluginLoader.ts
  11. 1
    1
      src/backend/RPCConfigLoader.ts

+ 83
- 0
.drone.yml 查看文件

@@ -0,0 +1,83 @@
1
+---
2
+kind: pipeline
3
+type: docker
4
+name: default
5
+
6
+
7
+steps:
8
+
9
+- name: build created
10
+  image: alpine
11
+  commands:
12
+    - echo ${DRONE_BUILD_CREATED}
13
+
14
+- name: restore cache
15
+  image: drillster/drone-volume-cache
16
+  settings:
17
+    restore: true
18
+    mount:
19
+      - ./node_modules
20
+  volumes:
21
+  - name: cache
22
+    path: /cache
23
+
24
+- name: npm install
25
+  image: node:12
26
+  commands:
27
+  - npm install
28
+
29
+- name: npm run build
30
+  image: node:12
31
+  commands:
32
+  - npm run build
33
+
34
+- name: rebuild cache
35
+  image: drillster/drone-volume-cache
36
+  settings:
37
+    rebuild: true
38
+    mount:
39
+      - ./node_modules
40
+  volumes:
41
+  - name: cache
42
+    path: /cache
43
+
44
+- name: deliver dist
45
+  image: node:12
46
+  commands:
47
+  - echo ${DRONE_BUILD_CREATED}
48
+  - git clone https://www.versioncontrol.me/frontwork-distribution/${DRONE_REPO_NAME}.git; cd ${DRONE_REPO_NAME} && rm -rf ./*; cp -r ../dist/* .; cp ../LICENSE.md .
49
+  - git add --all; git -c user.email="${DRONE_COMMIT_AUTHOR_EMAIL}" -c user.name="${DRONE_COMMIT_AUTHOR}" commit --all --allow-empty --message "generated from tag ${DRONE_TAG}"
50
+  - (git tag ${DRONE_TAG} && git push --force https://$GIT_USER:$GIT_PASSWORD@www.versioncontrol.me/frontwork-distribution/${DRONE_REPO_NAME}.git master ${DRONE_TAG}) || true
51
+  environment:
52
+    GIT_USER:
53
+      from_secret: git_user
54
+    GIT_PASSWORD:
55
+      from_secret: git_password
56
+  when:
57
+    event:
58
+    - tag
59
+
60
+- name: deliver container
61
+  image: plugins/docker
62
+  settings:
63
+    registry: registry.conatum.eu
64
+    insecure: true
65
+    repo: registry.conatum.eu/frontwork/admin
66
+    tags: ${DRONE_BUILD_CREATED}
67
+
68
+- name: release container
69
+  image: plugins/docker
70
+  settings:
71
+    repo: frontwork/admin
72
+    tags: ${DRONE_TAG}
73
+    username: frontwork
74
+    password:
75
+      from_secret: docker_password
76
+  when:
77
+    event:
78
+    - tag
79
+    
80
+volumes:
81
+- name: cache 
82
+  host:
83
+    path: /tmp

+ 1
- 1
Dockerfile 查看文件

@@ -1,7 +1,7 @@
1 1
 FROM node:12.9.0-alpine
2 2
 RUN apk add git
3 3
 
4
-RUN git clone https://gitea.frontblock.me/fb-dist/admin.git dist
4
+RUN git clone https://www.versioncontrol.me/frontwork-distribution/admin.git dist
5 5
 
6 6
 EXPOSE 8080 20000
7 7
 ENTRYPOINT ["node", "dist/FrontblockAdmin.js"]

+ 6
- 0
LICENSE.md 查看文件

@@ -0,0 +1,6 @@
1
+Non commercial license
2
+=====================
3
+
4
+Copyright © `2019` `frontwork.me@gmail.com`
5
+
6
+exact license terms are to be announced. Dont steal our stuff or we sue you!!!

+ 3
- 3
package-lock.json 查看文件

@@ -4863,9 +4863,9 @@
4863 4863
       }
4864 4864
     },
4865 4865
     "rpclibrary": {
4866
-      "version": "1.3.4",
4867
-      "resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.4.tgz",
4868
-      "integrity": "sha512-wrAAJ6cknpsoH7xrcbzheps0NgnlGrCzHPfTVHB+VgM2QAeEJfbbleDRVkFyf8bZmCJqxlEk0P1DH3xhTB2TMA==",
4866
+      "version": "1.3.17",
4867
+      "resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.17.tgz",
4868
+      "integrity": "sha512-ZdhZ1TSDO+bcz5kCJ7Ol+YAAyYpwg7YI/hETS4vv3RYerUEQVZSZjcm22J5a91RnQVN2SRiXzdoXbbFb/Renog==",
4869 4869
       "requires": {
4870 4870
         "bsock": "^0.1.9",
4871 4871
         "http": "0.0.0",

+ 1
- 1
package.json 查看文件

@@ -37,7 +37,7 @@
37 37
     "node-fetch": "^2.6.0",
38 38
     "path": "^0.12.7",
39 39
     "rimraf": "^3.0.0",
40
-    "rpclibrary": "^1.3.4",
40
+    "rpclibrary": "^1.3.17",
41 41
     "simple-git": "^1.124.0",
42 42
     "spawn-sync": "^2.0.0",
43 43
     "sqlite3": "^4.1.0",

+ 1
- 1
src/backend/Admin.ts 查看文件

@@ -2,7 +2,7 @@
2 2
 
3 3
 import { getLogger } from 'frontblock-generic/Types';
4 4
 import { promises as fs, mkdirSync } from "fs"
5
-import { RPCServer } from 'rpclibrary/js/src/Backend'
5
+import { RPCServer } from 'rpclibrary'
6 6
 import { AdminConf, TableDefiniton } from './Types';
7 7
 import { RPCConfigLoader } from './RPCConfigLoader';
8 8
 import { RPCPluginLoader } from './PluginLoader';

+ 1
- 2
src/backend/Eventbus.ts 查看文件

@@ -1,5 +1,4 @@
1
-import { RPCExporter } from "rpclibrary/js/src/Interfaces";
2
-import { SubscriptionResponse, ErrorResponse, SuccessResponse } from "rpclibrary/js/src/Types";
1
+import { RPCExporter, SubscriptionResponse, ErrorResponse, SuccessResponse } from "rpclibrary";
3 2
 import { FrontworkAdmin } from "./Admin";
4 3
 import { TableDefinitionExporter } from "./Interfaces";
5 4
 import { getLogger } from 'frontblock-generic/Types';

+ 1
- 1
src/backend/Installer.ts 查看文件

@@ -1,4 +1,4 @@
1
-import { Plugin } from "frontblock-generic/Plugin"
1
+import { Plugin } from "./Plugin"
2 2
 import { getLogger } from "frontblock-generic/Types"
3 3
 import { FrontworkAdmin } from "./Admin";
4 4
 var exec = require('child-process-promise').exec;

+ 1
- 2
src/backend/Plugin.ts 查看文件

@@ -1,7 +1,6 @@
1 1
 import { FrontworkAdmin } from "./Admin"
2
-import { RPC } from "rpclibrary/js/src/Types"
2
+import { RPC, RPCExporter } from "rpclibrary"
3 3
 import { TableDefiniton } from "./Types"
4
-import { RPCExporter } from "rpclibrary/js/src/Interfaces"
5 4
 import { TableDefinitionExporter } from "./Interfaces"
6 5
 import { ConfigExporter } from "loadson"
7 6
 

+ 1
- 1
src/backend/PluginLoader.ts 查看文件

@@ -1,4 +1,4 @@
1
-import { RPCExporter } from "rpclibrary/js/src/Interfaces";
1
+import { RPCExporter } from "rpclibrary";
2 2
 import { Git } from "upgiter"
3 3
 import { FolderStatus } from "upgiter/js/src/Types";
4 4
 import { Plugin } from "./Plugin";

+ 1
- 1
src/backend/RPCConfigLoader.ts 查看文件

@@ -1,5 +1,5 @@
1 1
 import { ConfigLoader } from 'loadson'
2
-import { RPCExporter } from 'rpclibrary/js/src/Interfaces'
2
+import { RPCExporter } from 'rpclibrary'
3 3
 
4 4
 export type ConfigLoaderIfc<ConfT> = {
5 5
     Config : {

Loading…
取消
儲存