Skip to content
This repository has been archived by the owner on Feb 4, 2023. It is now read-only.

Commit

Permalink
Merge pull request #15 from louis70109/add-sentry
Browse files Browse the repository at this point in the history
feat: Add sentry
  • Loading branch information
louis70109 authored Apr 1, 2020
2 parents ab00c42 + 60cdbcd commit 5e9626c
Show file tree
Hide file tree
Showing 15 changed files with 428 additions and 48 deletions.
7 changes: 4 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ MONGO_URL=mongodb://localhost:27017/TwitchBot

CLIENT_ID=
CLIENT_SECRET=
REDIRECT_URI=https://{YOUR_DOMAIN}/notify/confirm
LIFF_ID=
LIFF_ID_CALLBACK=
REDIRECT_URI=https://liff.line.me/{LIFF_ID}
LIFF_ID={NOTIFY_PAGE}
LIFF_ID_CALLBACK={NOTIFY_CALLBACK_URI_SAME_WITH_REDIRECY_URI}
SENTRY_DSN=
20 changes: 20 additions & 0 deletions _error.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
const Sentry = require('@sentry/node');

const { NODE_ENV, SENTRY_DSN } = process.env;

const ENABLE_SENTRY = Boolean(SENTRY_DSN);
if (ENABLE_SENTRY) {
Sentry.init({
dsn: SENTRY_DSN,
});
}

module.exports = async function HandleError(context, { error }) {
console.error(error);
if (NODE_ENV === 'development') {
await context.sendText(error.stack);
}
if (ENABLE_SENTRY) {
Sentry.captureException(error);
}
};
9 changes: 0 additions & 9 deletions bottender.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,6 @@ module.exports = {
},
initialState: {},
channels: {
messenger: {
enabled: true,
path: '/webhooks/messenger',
pageId: process.env.MESSENGER_PAGE_ID,
accessToken: process.env.MESSENGER_ACCESS_TOKEN,
appId: process.env.MESSENGER_APP_ID,
appSecret: process.env.MESSENGER_APP_SECRET,
verifyToken: process.env.MESSENGER_VERIFY_TOKEN,
},
line: {
enabled: true,
path: '/webhooks/line',
Expand Down
4 changes: 2 additions & 2 deletions dist/controller/notifiesController.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ var NotifyController = /** @class */ (function () {
if (!isAlive) {
$notify.save(function (err) {
if (err)
throw err;
throw Error("Notify \u5132\u5B58\u5931\u6557\uFF1A " + err);
});
}
else {
Expand All @@ -49,7 +49,7 @@ var NotifyController = /** @class */ (function () {
};
notify_1.NotifyModel.findOneAndUpdate({ userId: userId }, userObj, function (err, _) {
if (err)
console.log(err);
throw Error("Notify \u66F4\u65B0\u5931\u6557: " + err);
});
}
});
Expand Down
2 changes: 1 addition & 1 deletion dist/controller/users/binding.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function userBinding(context, _a) {
user.save(function (err) {
if (err) {
sendMessage_1.default(context, '❌ 綁定失敗');
return;
throw Error("\u5E33\u865F\u7D81\u5B9A\u5931\u6557: " + err);
}
});
}
Expand Down
73 changes: 73 additions & 0 deletions dist/richmenu/richmenu.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
var path_1 = __importDefault(require("path"));
var BLOCK_WIDTH = 1200 / 4;
module.exports = {
meta: {
image: {
type: 'file',
path: path_1.default.resolve(__dirname, 'AB_richmenu_C.png'),
},
},
richmenu: {
size: {
width: 2500,
height: 843
},
selected: true,
name: "Controller",
chatBarText: "幫你找直播!",
areas: [
{
bounds: {
x: 0,
y: 0,
width: 625,
height: 843
},
action: {
type: "message",
text: "follow"
}
},
{
bounds: {
x: 625,
y: 0,
width: 625,
height: 843
},
action: {
type: "message",
text: "top"
}
},
{
bounds: {
x: 1250,
y: 0,
width: 625,
height: 843
},
action: {
type: "message",
text: "help"
}
},
{
bounds: {
x: 1875,
y: 0,
width: 625,
height: 843
},
action: {
type: "uri",
uri: "https://liff.line.me/1653917374-QqknRPqk"
}
}
]
}
};
79 changes: 79 additions & 0 deletions dist/richmenu/syncRichmenus.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __generator = (this && this.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) throw new TypeError("Generator is already executing.");
while (_) try {
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
if (y = 0, t) op = [op[0] & 2, t.value];
switch (op[0]) {
case 0: case 1: t = op; break;
case 4: _.label++; return { value: op[1], done: false };
case 5: _.label++; y = op[1]; op = [0]; continue;
case 7: op = _.ops.pop(); _.trys.pop(); continue;
default:
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
if (t[2]) _.ops.pop();
_.trys.pop(); continue;
}
op = body.call(thisArg, _);
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
}
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
// https://github.com/Yoctol/bottender/blob/master/packages/bottender/src/cli/providers/line/menu.js
var fs_1 = __importDefault(require("fs"));
var messaging_api_line_1 = require("messaging-api-line");
var bottender_config_1 = __importDefault(require("../bottender.config"));
var client = messaging_api_line_1.LineClient.connect(bottender_config_1.default.channels.line);
(function () { return __awaiter(void 0, void 0, void 0, function () {
var createdRichMenus, i, bMenuId;
return __generator(this, function (_a) {
switch (_a.label) {
case 0: return [4 /*yield*/, client.getRichMenuList()];
case 1:
createdRichMenus = _a.sent();
i = 0;
_a.label = 2;
case 2:
if (!(i < createdRichMenus.length)) return [3 /*break*/, 5];
// eslint-disable-next-line no-await-in-loop
return [4 /*yield*/, client.deleteRichMenu(createdRichMenus[i].richMenuId)];
case 3:
// eslint-disable-next-line no-await-in-loop
_a.sent();
_a.label = 4;
case 4:
i++;
return [3 /*break*/, 2];
case 5:
import richmenu from './richmenu';
return [4 /*yield*/, client.createRichMenu(richmenu_1.default)];
case 6:
bMenuId = (_a.sent()).richMenuId;
return [4 /*yield*/, client.uploadRichMenuImage(bMenuId, fs_1.default.readFileSync(richmenuB.meta.image.path))];
case 7:
_a.sent();
console.log({ bMenuId: bMenuId });
return [2 /*return*/];
}
});
}); })();
2 changes: 1 addition & 1 deletion dist/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ app.prepare().then(function () {
.then(function () { return (mongoose_1.default.Promise = global.Promise); });
if (err) {
mongoose_1.default.connection.close();
throw err;
throw Error("Mongo error: " + err);
}
console.log("> Ready on http://localhost:" + port);
});
Expand Down
Loading

0 comments on commit 5e9626c

Please sign in to comment.